[fix] network policy acceptance test

First the network policy acceptance test by specifying a random name for created user resources. Also pin the terraform version used in acceptance tests.
Snowflake-Labs · Dec 2, 2020 · 17452c8 · 17452c8
1 parent aea83d2
commit 17452c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -4,6 +4,7 @@ export DIRTY=$(shell if `git diff-index --quiet HEAD --`; then echo false; else
 LDFLAGS=-ldflags "-w -s -X github.com/chanzuckerberg/go-misc/ver.GitSha=${SHA} -X github.com/chanzuckerberg/go-misc/ver.Version=${VERSION} -X github.com/chanzuckerberg/go-misc/ver.Dirty=${DIRTY}"
 export BASE_BINARY_NAME=terraform-provider-snowflake_v$(VERSION)
 export GO111MODULE=on
+export TF_ACC_TERRAFORM_VERSION=0.12.29
 
 all: test docs install
 .PHONY: all

diff --git a/pkg/resources/network_policy_attachment_acceptance_test.go b/pkg/resources/network_policy_attachment_acceptance_test.go
@@ -14,13 +14,15 @@ func TestAccNetworkPolicyAttachment(t *testing.T) {
 		t.Skip("Skipping TestAccNetworkPolicyAttachment")
 	}
 
+	user1 := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
+	user2 := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
 	policyName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
 
 	resource.Test(t, resource.TestCase{
 		Providers: providers(),
 		Steps: []resource.TestStep{
 			{
-				Config: networkPolicyAttachmentConfig(policyName),
+				Config: networkPolicyAttachmentConfig(user1, user2, policyName),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_network_policy_attachment.test", "network_policy_name", policyName),
 					resource.TestCheckResourceAttr("snowflake_network_policy_attachment.test", "set_for_account", "false"),
@@ -37,14 +39,14 @@ func TestAccNetworkPolicyAttachment(t *testing.T) {
 	})
 }
 
-func networkPolicyAttachmentConfig(policyName string) string {
+func networkPolicyAttachmentConfig(user1, user2, policyName string) string {
 	return fmt.Sprintf(`
 resource "snowflake_user" "test-user1" {
-	name = "test-user1"
+	name = "%s"
 }
 
 resource "snowflake_user" "test-user2" {
-	name = "test-user2"
+	name = "%s"
 }
 
 resource "snowflake_network_policy" "test" {
@@ -57,5 +59,5 @@ resource "snowflake_network_policy_attachment" "test" {
 	set_for_account     = false
 	users               = [snowflake_user.test-user1.name, snowflake_user.test-user2.name]
 }
-`, policyName)
+`, user1, user2, policyName)
 }