Refactor CI: Use Drone and Go 1.16 (#168)

trotttrotttrott · web-flow · commit a08485835504 · 2021-02-18T17:46:42.000-07:00
diff --git a/.drone.yml b/.drone.yml
@@ -0,0 +1,29 @@
+---
+kind: pipeline
+type: docker
+name: test-pr
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: tests
+  image: golang:1.16
+  commands:
+  - make vet
+  - make test
+  - make testacc
+  environment:
+    GRAFANA_URL: http://grafana:3000
+    GRAFANA_AUTH: admin:admin
+    GRAFANA_ORG_ID: 1
+
+services:
+- name: grafana
+  image: grafana/grafana:7.4.2
+
+trigger:
+  event:
+  - pull_request
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -4,6 +4,8 @@
 
 # Terraform Provider for Grafana
 
+[![Build Status](https://drone.grafana.net/api/badges/grafana/terraform-provider-grafana/status.svg)](https://drone.grafana.net/grafana/terraform-provider-grafana)
+
 - Terraform website: https://terraform.io
 - Grafana website: https://grafana.com
 - Provider Documentation: https://registry.terraform.io/providers/grafana/grafana/latest/docs
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   grafana-provider:
-    image: golang:1.14
+    image: golang:1.16
     environment:
       - GRAFANA_URL=http://grafana:3000
       - GRAFANA_AUTH=admin:admin
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/terraform-providers/terraform-provider-grafana
 
-go 1.14
+go 1.16
 
 require (
 	github.com/grafana/grafana-api-golang-client v0.0.0-20210204123314-0aa501c4b8c4
diff --git a/grafana/resource_alert_notification_test.go b/grafana/resource_alert_notification_test.go
@@ -95,7 +95,7 @@ func TestAccAlertNotification_invalid_frequence(t *testing.T) {
 		CheckDestroy: testAccAlertNotificationCheckDestroy(&alertNotification),
 		Steps: []resource.TestStep{
 			{
-				ExpectError: regexp.MustCompile("time: invalid duration hi"),
+				ExpectError: regexp.MustCompile("time: invalid duration \"hi\""),
 				Config:      testAccAlertNotificationConfig_invalid_frequency,
 			},
 		},

-Original file line number
+Diff line change
 module github.com/terraform-providers/terraform-provider-grafana
 -go 1.14
 +go 1.16
 require (
 	github.com/grafana/grafana-api-golang-client v0.0.0-20210204123314-0aa501c4b8c4
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func TestAccAlertNotification_invalid_frequence(t *testing.T) {`
`95`	`95`	`CheckDestroy: testAccAlertNotificationCheckDestroy(&alertNotification),`
`96`	`96`	`Steps: []resource.TestStep{`
`97`	`97`	`{`
`98`		`- ExpectError: regexp.MustCompile("time: invalid duration hi"),`
	`98`	`+ ExpectError: regexp.MustCompile("time: invalid duration \"hi\""),`
`99`	`99`	`Config: testAccAlertNotificationConfig_invalid_frequency,`
`100`	`100`	`},`
`101`	`101`	`},`