Tests: Get all configs from Vault (#716)

This allows us to switch to a different Cloud account
There is currently a bug deleting Grafana Cloud instances in the current account so I'm switching over to a new one

Author: julienduchesne

.drone/drone.jsonnet

@@ -24,13 +24,23 @@ local secret(name, vaultPath, vaultKey) = {
     path: vaultPath,
     name: vaultKey,
   },
+};
 
-  fromSecret:: { from_secret: name },
+local fromSecret(secret) = {
+  from_secret: secret.name,
+};
+
+local secrets = {
+  // Grafana Cloud API test secrets
+  cloudOrg: secret('grafana-cloud-org', 'infra/data/ci/terraform-provider-grafana/cloud', 'cloud-org'),
+  cloudApiKey: secret('grafana-cloud-api-key', 'infra/data/ci/terraform-provider-grafana/cloud', 'cloud-api-key'),
+
+  // Grafana Enterprise test secrets (Instance running in Grafana Cloud)
+  cloudInstanceUrl: secret('grafana-cloud-instance-url', 'infra/data/ci/terraform-provider-grafana/cloud', 'cloud-instance-url'),
+  apiToken: secret('grafana-api-token', 'infra/data/ci/terraform-provider-grafana/cloud', 'api-key'),
+  smToken: secret('grafana-sm-token', 'infra/data/ci/terraform-provider-grafana/cloud', 'sm-access-token'),
+  onCallToken: secret('grafana-oncall-token', 'infra/data/ci/terraform-provider-grafana/cloud', 'oncall-access-token'),
 };
-local cloudApiKey = secret('grafana-cloud-api-key', 'infra/data/ci/terraform-provider-grafana/cloud', 'cloud-api-key');
-local apiToken = secret('grafana-api-token', 'infra/data/ci/terraform-provider-grafana/cloud', 'api-key');
-local smToken = secret('grafana-sm-token', 'infra/data/ci/terraform-provider-grafana/cloud', 'sm-access-token');
-local onCallToken = secret('grafana-oncall-token', 'infra/data/ci/terraform-provider-grafana/cloud', 'oncall-access-token');
 
 local pipeline(name, steps, services=[]) = {
   kind: 'pipeline',
@@ -129,8 +139,8 @@ local pipeline(name, steps, services=[]) = {
           'make testacc-cloud-api',
         ],
         environment: {
-          GRAFANA_CLOUD_API_KEY: cloudApiKey.fromSecret,
-          GRAFANA_CLOUD_ORG: 'terraformprovidergrafana',
+          GRAFANA_CLOUD_API_KEY: fromSecret(secrets.cloudApiKey),
+          GRAFANA_CLOUD_ORG: fromSecret(secrets.cloudOrg),
           TF_ACC_TERRAFORM_PATH: terraformPath,
         },
       },
@@ -139,40 +149,37 @@ local pipeline(name, steps, services=[]) = {
     concurrency: { limit: 1 },
   },
 
-  local cloud_instance_url = 'https://terraformprovidergrafana.grafana.net/';
   pipeline(
     'cloud instance tests',
     steps=[
       installTerraformStep,
       {
         name: 'wait for instance',
         image: images.go,
-        commands: ['.drone/wait-for-instance.sh ' + cloud_instance_url],
+        commands: ['.drone/wait-for-instance.sh $${GRAFANA_URL}'],
+        environment: {
+          GRAFANA_URL: fromSecret(secrets.cloudInstanceUrl),
+        },
       },
       {
         name: 'tests',
         image: images.go,
         commands: ['make testacc-cloud-instance'],
         environment: {
-          GRAFANA_URL: cloud_instance_url,
-          GRAFANA_AUTH: apiToken.fromSecret,
-          GRAFANA_SM_ACCESS_TOKEN: smToken.fromSecret,
+          GRAFANA_URL: fromSecret(secrets.cloudInstanceUrl),
+          GRAFANA_AUTH: fromSecret(secrets.apiToken),
+          GRAFANA_SM_ACCESS_TOKEN: fromSecret(secrets.smToken),
           GRAFANA_ORG_ID: 1,
-          GRAFANA_ONCALL_ACCESS_TOKEN: onCallToken.fromSecret,
+          GRAFANA_ONCALL_ACCESS_TOKEN: fromSecret(secrets.onCallToken),
           TF_ACC_TERRAFORM_PATH: terraformPath,
         },
       },
     ]
   ) + {
     concurrency: { limit: 1 },
   },
-
-  cloudApiKey,
-  apiToken,
-  smToken,
-  onCallToken,
-] +
-[
+]
++ [
   pipeline(
     'oss tests: %s' % version,
     steps=[
@@ -206,3 +213,4 @@ local pipeline(name, steps, services=[]) = {
   )
   for version in grafanaVersions
 ]
++ std.objectValuesAll(secrets)

.drone/drone.yml

@@ -106,7 +106,8 @@ steps:
   environment:
     GRAFANA_CLOUD_API_KEY:
       from_secret: grafana-cloud-api-key
-    GRAFANA_CLOUD_ORG: terraformprovidergrafana
+    GRAFANA_CLOUD_ORG:
+      from_secret: grafana-cloud-org
     TF_ACC_TERRAFORM_PATH: /drone/terraform-provider-grafana/terraform
   image: golang:1.18
   name: tests
@@ -135,7 +136,10 @@ steps:
   image: hashicorp/terraform
   name: download-terraform
 - commands:
-  - .drone/wait-for-instance.sh https://terraformprovidergrafana.grafana.net/
+  - .drone/wait-for-instance.sh $${GRAFANA_URL}
+  environment:
+    GRAFANA_URL:
+      from_secret: grafana-cloud-instance-url
   image: golang:1.18
   name: wait for instance
 - commands:
@@ -148,7 +152,8 @@ steps:
     GRAFANA_ORG_ID: 1
     GRAFANA_SM_ACCESS_TOKEN:
       from_secret: grafana-sm-token
-    GRAFANA_URL: https://terraformprovidergrafana.grafana.net/
+    GRAFANA_URL:
+      from_secret: grafana-cloud-instance-url
     TF_ACC_TERRAFORM_PATH: /drone/terraform-provider-grafana/terraform
   image: golang:1.18
   name: tests
@@ -162,30 +167,6 @@ type: docker
 workspace:
   path: /drone/terraform-provider-grafana
 ---
-get:
-  name: cloud-api-key
-  path: infra/data/ci/terraform-provider-grafana/cloud
-kind: secret
-name: grafana-cloud-api-key
----
-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
----
-get:
-  name: oncall-access-token
-  path: infra/data/ci/terraform-provider-grafana/cloud
-kind: secret
-name: grafana-oncall-token
----
 kind: pipeline
 name: 'oss tests: 9.1.0'
 platform:
@@ -408,7 +389,43 @@ 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: cloud-api-key
+  path: infra/data/ci/terraform-provider-grafana/cloud
+kind: secret
+name: grafana-cloud-api-key
+---
+get:
+  name: cloud-instance-url
+  path: infra/data/ci/terraform-provider-grafana/cloud
+kind: secret
+name: grafana-cloud-instance-url
+---
+get:
+  name: cloud-org
+  path: infra/data/ci/terraform-provider-grafana/cloud
+kind: secret
+name: grafana-cloud-org
+---
+get:
+  name: oncall-access-token
+  path: infra/data/ci/terraform-provider-grafana/cloud
+kind: secret
+name: grafana-oncall-token
+---
+get:
+  name: sm-access-token
+  path: infra/data/ci/terraform-provider-grafana/cloud
+kind: secret
+name: grafana-sm-token
+---
 kind: signature
-hmac: 307c016f2f24164ae2fa96bc6f30ae7a8d8840e0e66495ef9146c22d4780fdd1
+hmac: 859b4ecec6d95fed515f77177060967caf27b048bb6d8539a0b8a5f85317fd78
 
 ...

GNUmakefile

@@ -41,10 +41,11 @@ release:
 	@git tag $$RELEASE_VERSION
 	@git push origin $$RELEASE_VERSION
 
+DRONE_DOCKER := docker run --rm -e DRONE_SERVER -e DRONE_TOKEN -v ${PWD}:${PWD} -w "${PWD}" drone/cli:1.6.1
 drone:
-	drone jsonnet --stream --source .drone/drone.jsonnet --target .drone/drone.yml --format
-	drone lint .drone/drone.yml
-	drone sign --save grafana/terraform-provider-grafana .drone/drone.yml
+	$(DRONE_DOCKER) jsonnet --stream --source .drone/drone.jsonnet --target .drone/drone.yml --format
+	$(DRONE_DOCKER) lint .drone/drone.yml
+	$(DRONE_DOCKER) sign --save grafana/terraform-provider-grafana .drone/drone.yml
 
 golangci-lint:
 	docker run \

grafana/resource_cloud_plugin_test.go

@@ -2,6 +2,7 @@ package grafana
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -11,7 +12,7 @@ import (
 func TestAccResourceCloudPluginInstallation(t *testing.T) {
 	CheckCloudAPITestsEnabled(t)
 
-	slug := "terraformprovidergrafana"
+	slug := os.Getenv("GRAFANA_CLOUD_ORG")
 	pluginSlug := "aws-datasource-provisioner-app"
 	pluginVersion := "1.7.0"