Run OSS tests on all currently supported versions (#321)

julienduchesne · web-flow · commit 1294c2380ffd · 2021-12-22T14:40:16.000-05:00
* Run OSS tests on all currently supported versions Add all 8.x versions + the latest 7.x Closes #318 * Use lighter build images * Add make * Use debian go instead of alpine * Use GetAPIKeys instead of Delete to check for deletion
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
@@ -1,7 +1,9 @@
-local grafana = 'grafana/grafana:8.2.5';
-local build = 'grafana/build-container:1.4.7';
-local goImage = 'golang:1.16-alpine';
-
+local grafanaVersions = ['8.3.3', '8.2.7', '8.1.8', '8.0.7', '7.5.12'];
+local images = {
+  go: 'golang:1.16',
+  lint: 'golangci/golangci-lint',
+  grafana(version): 'grafana/grafana:' + version,
+};
 
 local secret(name, vaultPath, vaultKey) = {
   kind: 'secret',
@@ -40,7 +42,7 @@ local pipeline(name, steps, services=[]) = {
     'lint', steps=[
       {
         name: 'lint',
-        image: build,
+        image: images.lint,
         commands: [
           'golangci-lint --version',
           'golangci-lint run ./...',
@@ -53,9 +55,8 @@ local pipeline(name, steps, services=[]) = {
     'docs', steps=[
       {
         name: 'check for drift',
-        image: goImage,
+        image: images.go,
         commands: [
-          'apk add git',
           'go generate',
           'gitstatus="$(git status --porcelain)"',
           'if [ -n "$gitstatus" ]; then',
@@ -69,11 +70,34 @@ local pipeline(name, steps, services=[]) = {
   ),
 
   pipeline(
-    'oss tests',
+    'cloud tests',
     steps=[
       {
         name: 'tests',
-        image: build,
+        image: images.go,
+        commands: [
+          'make testacc-cloud',
+        ],
+        environment: {
+          GRAFANA_URL: 'https://terraformprovidergrafana.grafana.net/',
+          GRAFANA_AUTH: apiToken.fromSecret,
+          GRAFANA_SM_ACCESS_TOKEN: smToken.fromSecret,
+          GRAFANA_ORG_ID: 1,
+        },
+      },
+    ]
+  ),
+
+  apiToken,
+  smToken,
+] +
+[
+  pipeline(
+    'oss tests: %s' % version,
+    steps=[
+      {
+        name: 'tests',
+        image: images.go,
         commands: [
           'sleep 5',  // https://docs.drone.io/pipeline/docker/syntax/services/#initialization
           'make testacc-oss',
@@ -88,32 +112,13 @@ local pipeline(name, steps, services=[]) = {
     services=[
       {
         name: 'grafana',
-        image: grafana,
+        image: images.grafana(version),
         environment: {
           // Prevents error="database is locked"
           GF_DATABASE_URL: 'sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL',
         },
       },
     ],
-  ),
-
-  pipeline(
-    'cloud tests',
-    steps=[
-      {
-        name: 'tests',
-        image: build,
-        commands: ['make testacc-cloud'],
-        environment: {
-          GRAFANA_URL: 'https://terraformprovidergrafana.grafana.net/',
-          GRAFANA_AUTH: apiToken.fromSecret,
-          GRAFANA_SM_ACCESS_TOKEN: smToken.fromSecret,
-          GRAFANA_ORG_ID: 1,
-        },
-      },
-    ]
-  ),
-
-  apiToken,
-  smToken,
+  )
+  for version in grafanaVersions
 ]
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -9,7 +9,7 @@ steps:
 - commands:
   - golangci-lint --version
   - golangci-lint run ./...
-  image: grafana/build-container:1.4.7
+  image: golangci/golangci-lint
   name: lint
 trigger:
   branch:
@@ -29,15 +29,14 @@ platform:
 services: []
 steps:
 - commands:
-  - apk add git
   - go generate
   - gitstatus="$(git status --porcelain)"
   - if [ -n "$gitstatus" ]; then
   - '  echo "$gitstatus"'
   - '  echo "docs are out of sync, run \"go generate\""'
   - '  exit 1'
   - fi
-  image: golang:1.16-alpine
+  image: golang:1.16
   name: check for drift
 trigger:
   branch:
@@ -50,14 +49,54 @@ workspace:
   path: /drone/terraform-provider-grafana
 ---
 kind: pipeline
-name: oss tests
+name: cloud tests
+platform:
+  arch: amd64
+  os: linux
+services: []
+steps:
+- commands:
+  - make testacc-cloud
+  environment:
+    GRAFANA_AUTH:
+      from_secret: grafana-api-token
+    GRAFANA_ORG_ID: 1
+    GRAFANA_SM_ACCESS_TOKEN:
+      from_secret: grafana-sm-token
+    GRAFANA_URL: https://terraformprovidergrafana.grafana.net/
+  image: golang:1.16
+  name: tests
+trigger:
+  branch:
+  - master
+  event:
+  - pull_request
+  - push
+type: docker
+workspace:
+  path: /drone/terraform-provider-grafana
+---
+get:
+  name: api-key
+  path: infra/data/ci/terraform-provider-grafana/cloud
+kind: secret
+name: grafana-api-token
+---
+get:
+  name: sm-access-token
+  path: infra/data/ci/terraform-provider-grafana/cloud
+kind: secret
+name: grafana-sm-token
+---
+kind: pipeline
+name: 'oss tests: 8.3.3'
 platform:
   arch: amd64
   os: linux
 services:
 - environment:
     GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
-  image: grafana/grafana:8.2.5
+  image: grafana/grafana:8.3.3
   name: grafana
 steps:
 - commands:
@@ -67,7 +106,7 @@ steps:
     GRAFANA_AUTH: admin:admin
     GRAFANA_ORG_ID: 1
     GRAFANA_URL: http://grafana:3000
-  image: grafana/build-container:1.4.7
+  image: golang:1.16
   name: tests
 trigger:
   branch:
@@ -80,22 +119,24 @@ workspace:
   path: /drone/terraform-provider-grafana
 ---
 kind: pipeline
-name: cloud tests
+name: 'oss tests: 8.2.7'
 platform:
   arch: amd64
   os: linux
-services: []
+services:
+- environment:
+    GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
+  image: grafana/grafana:8.2.7
+  name: grafana
 steps:
 - commands:
-  - make testacc-cloud
+  - sleep 5
+  - make testacc-oss
   environment:
-    GRAFANA_AUTH:
-      from_secret: grafana-api-token
+    GRAFANA_AUTH: admin:admin
     GRAFANA_ORG_ID: 1
-    GRAFANA_SM_ACCESS_TOKEN:
-      from_secret: grafana-sm-token
-    GRAFANA_URL: https://terraformprovidergrafana.grafana.net/
-  image: grafana/build-container:1.4.7
+    GRAFANA_URL: http://grafana:3000
+  image: golang:1.16
   name: tests
 trigger:
   branch:
@@ -107,19 +148,97 @@ type: docker
 workspace:
   path: /drone/terraform-provider-grafana
 ---
-get:
-  name: api-key
-  path: infra/data/ci/terraform-provider-grafana/cloud
-kind: secret
-name: grafana-api-token
+kind: pipeline
+name: 'oss tests: 8.1.8'
+platform:
+  arch: amd64
+  os: linux
+services:
+- environment:
+    GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
+  image: grafana/grafana:8.1.8
+  name: grafana
+steps:
+- commands:
+  - sleep 5
+  - make testacc-oss
+  environment:
+    GRAFANA_AUTH: admin:admin
+    GRAFANA_ORG_ID: 1
+    GRAFANA_URL: http://grafana:3000
+  image: golang:1.16
+  name: tests
+trigger:
+  branch:
+  - master
+  event:
+  - pull_request
+  - push
+type: docker
+workspace:
+  path: /drone/terraform-provider-grafana
 ---
-get:
-  name: sm-access-token
-  path: infra/data/ci/terraform-provider-grafana/cloud
-kind: secret
-name: grafana-sm-token
+kind: pipeline
+name: 'oss tests: 8.0.7'
+platform:
+  arch: amd64
+  os: linux
+services:
+- environment:
+    GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
+  image: grafana/grafana:8.0.7
+  name: grafana
+steps:
+- commands:
+  - sleep 5
+  - make testacc-oss
+  environment:
+    GRAFANA_AUTH: admin:admin
+    GRAFANA_ORG_ID: 1
+    GRAFANA_URL: http://grafana:3000
+  image: golang:1.16
+  name: tests
+trigger:
+  branch:
+  - master
+  event:
+  - pull_request
+  - push
+type: docker
+workspace:
+  path: /drone/terraform-provider-grafana
+---
+kind: pipeline
+name: 'oss tests: 7.5.12'
+platform:
+  arch: amd64
+  os: linux
+services:
+- environment:
+    GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
+  image: grafana/grafana:7.5.12
+  name: grafana
+steps:
+- commands:
+  - sleep 5
+  - make testacc-oss
+  environment:
+    GRAFANA_AUTH: admin:admin
+    GRAFANA_ORG_ID: 1
+    GRAFANA_URL: http://grafana:3000
+  image: golang:1.16
+  name: tests
+trigger:
+  branch:
+  - master
+  event:
+  - pull_request
+  - push
+type: docker
+workspace:
+  path: /drone/terraform-provider-grafana
 ---
 kind: signature
-hmac: 309ebe722ec79c0757942e8b3abc29ff11f472844c9a9bff8231d8c7c20616ed
+hmac: 08afcf164f1e51f8ae7c7ccbf390c0ab4c7ef3cab3015c7dccabb26123474f32
 
 ...
diff --git a/GNUmakefile b/GNUmakefile
@@ -1,4 +1,4 @@
-GRAFANA_VERSION ?= 8.2.5
+GRAFANA_VERSION ?= 8.3.3
 
 testacc:
 	TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m
diff --git a/grafana/resource_api_key_test.go b/grafana/resource_api_key_test.go
@@ -62,9 +62,15 @@ func testAccGrafanaAuthKeyCheckDestroy(s *terraform.State) error {
 			return err
 		}
 
-		_, err = c.DeleteAPIKey(id)
-		if err == nil {
-			return fmt.Errorf("api key still exists")
+		keys, err := c.GetAPIKeys(false)
+		if err != nil {
+			return err
+		}
+
+		for _, key := range keys {
+			if key.ID == id {
+				return fmt.Errorf("API key still exists")
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-GRAFANA_VERSION ?= 8.2.5`
	`1`	`+GRAFANA_VERSION ?= 8.3.3`
`2`	`2`
`3`	`3`	`testacc:`
`4`	`4`	`TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,15 @@ func testAccGrafanaAuthKeyCheckDestroy(s *terraform.State) error {`
`62`	`62`	`return err`
`63`	`63`	`}`
`64`	`64`
`65`		`- _, err = c.DeleteAPIKey(id)`
`66`		`- if err == nil {`
`67`		`- return fmt.Errorf("api key still exists")`
	`65`	`+ keys, err := c.GetAPIKeys(false)`
	`66`	`+ if err != nil {`
	`67`	`+ return err`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ for _, key := range keys {`
	`71`	`+ if key.ID == id {`
	`72`	`+ return fmt.Errorf("API key still exists")`
	`73`	`+ }`
`68`	`74`	`}`
`69`	`75`	`}`
`70`	`76`