Fix TestAccDataSourceNotFound test (#27)

adambarreiro · web-flow · commit 826e662cc32c · 2025-02-04T11:15:43.000+01:00
Signed-off-by: abarreiro &lt;abarreiro@vmware.com&gt;
diff --git a/.changes/v1.0.0/27-notes.md b/.changes/v1.0.0/27-notes.md
@@ -0,0 +1 @@
+- Add GitHub Action to detect replaced go-vcloud-director SDK in `go.mod` in PRs [GH-27]
diff --git a/.github/workflows/check-mod.yml b/.github/workflows/check-mod.yml
@@ -0,0 +1,18 @@
+name: check-mod
+on:
+  pull_request
+
+jobs:
+  build:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: No replaced Go module
+        run: |
+          set +e
+          grep 'replace github.com/vmware/go-vcloud-director' go.mod
+          if [ "$?" -eq 0 ]; then echo "ERROR: Found a replaced go.mod. Remove the replacement before merging"; exit 1; else exit 0; fi
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
-	github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.24
+	github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.25
 )
 
 require (
@@ -66,5 +66,3 @@ require (
 	google.golang.org/protobuf v1.35.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
-
-replace github.com/vmware/go-vcloud-director/v3 => github.com/adambarreiro/go-vcloud-director/v3 v3.0.0-20250130150058-c5c28c2bb173
diff --git a/go.sum b/go.sum
@@ -4,8 +4,6 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/adambarreiro/go-vcloud-director/v3 v3.0.0-20250130150058-c5c28c2bb173 h1:WwtoMKQfBr9L1ezqTgRVA/ZutaFDZBFsi3HoC8wY8Do=
-github.com/adambarreiro/go-vcloud-director/v3 v3.0.0-20250130150058-c5c28c2bb173/go.mod h1:68KHsVns52dsq/w5JQYzauaU/+NAi1FmCxhBrFc/VoQ=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
@@ -151,6 +149,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.25 h1:THyQ5FnlrZxV9GeCfmQytvdnE9rdfsPf8hT+LmfNsCY=
+github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.25/go.mod h1:68KHsVns52dsq/w5JQYzauaU/+NAi1FmCxhBrFc/VoQ=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
diff --git a/vcfa/datasource_not_found_test.go b/vcfa/datasource_not_found_test.go
@@ -153,6 +153,12 @@ func addMandatoryParams(dataSourceName string, mandatoryFields []string, t *test
 			templateFields = templateFields + `edge_cluster_id = "urn:vcloud:edgeCluster:12345678-1234-1234-1234-123456789012"` + "\n"
 		case "content_library_id":
 			templateFields = templateFields + `content_library_id = "urn:vcloud:contentLibrary:12345678-1234-1234-1234-123456789012"` + "\n"
+		case "alias": // vcfa_certificate
+			templateFields = templateFields + `alias = "non-existent-certificate"` + "\n"
+		case "username": // vcfa_org_local_user
+			templateFields = templateFields + `username = "non-existent-local-user"` + "\n"
+		case "org_regional_networking_id":
+			templateFields = templateFields + `org_regional_networking_id = "urn:vcloud:regionalNetworkingSetting:12345678-1234-1234-1234-123456789012"` + "\n"
 		}
 	}
 
diff --git a/vcfa/resource_vcfa_org_ldap_test.go b/vcfa/resource_vcfa_org_ldap_test.go

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+- Add GitHub Action to detect replaced go-vcloud-director SDK in `go.mod` in PRs [GH-27]
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ require (`
`6`	`6`	`github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320`
`7`	`7`	`github.com/hashicorp/go-version v1.7.0`
`8`	`8`	`github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0`
`9`		`- github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.24`
	`9`	`+ github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.25`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`require (`
`@@ -66,5 +66,3 @@ require (`
`66`	`66`	`google.golang.org/protobuf v1.35.1 // indirect`
`67`	`67`	`sigs.k8s.io/yaml v1.4.0 // indirect`
`68`	`68`	`)`
`69`		`-`
`70`		`-replace github.com/vmware/go-vcloud-director/v3 => github.com/adambarreiro/go-vcloud-director/v3 v3.0.0-20250130150058-c5c28c2bb173`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,12 @@ func addMandatoryParams(dataSourceName string, mandatoryFields []string, t *test`
`153`	`153`	templateFields = templateFields + `edge_cluster_id = "urn:vcloud:edgeCluster:12345678-1234-1234-1234-123456789012"` + "\n"
`154`	`154`	`case "content_library_id":`
`155`	`155`	templateFields = templateFields + `content_library_id = "urn:vcloud:contentLibrary:12345678-1234-1234-1234-123456789012"` + "\n"
	`156`	`+ case "alias": // vcfa_certificate`
	`157`	+ templateFields = templateFields + `alias = "non-existent-certificate"` + "\n"
	`158`	`+ case "username": // vcfa_org_local_user`
	`159`	+ templateFields = templateFields + `username = "non-existent-local-user"` + "\n"
	`160`	`+ case "org_regional_networking_id":`
	`161`	+ templateFields = templateFields + `org_regional_networking_id = "urn:vcloud:regionalNetworkingSetting:12345678-1234-1234-1234-123456789012"` + "\n"
`156`	`162`	`}`
`157`	`163`	`}`
`158`	`164`