Merge branch 'main' into netramali/TF-22972-add-project-varset-permission-to-team-project

netramali · web-flow · commit 8539a9e032e9 · 2025-01-10T09:22:58.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 * Add support for team notification configurations @notchairmk [#1016](https://github.com/hashicorp/go-tfe/pull/1016)
 
+## Bug Fixes
+
+* Update dependency `github.com/hashicorp/go-slug` `v0.16.0` => `v0.16.3` to integrate latest changes.
+
 # v1.72.0
 
 ## Enhancements
diff --git a/configuration_version_integration_test.go b/configuration_version_integration_test.go
@@ -311,7 +311,6 @@ func TestConfigurationVersionsUploadTarGzip(t *testing.T) {
 		packer, err := slug.NewPacker(
 			slug.DereferenceSymlinks(),
 			slug.ApplyTerraformIgnore(),
-			slug.AllowSymlinkTarget("/target/symlink/path/foo"),
 		)
 		require.NoError(t, err)
 
diff --git a/example_test.go b/example_test.go
@@ -90,9 +90,8 @@ func ExampleConfigurationVersions_UploadTarGzip() {
 	}
 
 	packer, err := slug.NewPacker(
-		slug.DereferenceSymlinks(),            // dereferences symlinks
-		slug.ApplyTerraformIgnore(),           // ignores paths specified in .terraformignore
-		slug.AllowSymlinkTarget("/some/path"), // allow certain symlink target paths
+		slug.DereferenceSymlinks(),  // dereferences symlinks
+		slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore
 	)
 	if err != nil {
 		log.Fatal(err)
@@ -131,9 +130,8 @@ func ExampleRegistryModules_UploadTarGzip() {
 	}
 
 	packer, err := slug.NewPacker(
-		slug.DereferenceSymlinks(),            // dereferences symlinks
-		slug.ApplyTerraformIgnore(),           // ignores paths specified in .terraformignore
-		slug.AllowSymlinkTarget("/some/path"), // allow certain symlink target paths
+		slug.DereferenceSymlinks(),  // dereferences symlinks
+		slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore
 	)
 	if err != nil {
 		log.Fatal(err)
diff --git a/examples/configuration_versions/main.go b/examples/configuration_versions/main.go
@@ -22,9 +22,8 @@ func main() {
 	}
 
 	packer, err := slug.NewPacker(
-		slug.DereferenceSymlinks(),            // dereferences symlinks
-		slug.ApplyTerraformIgnore(),           // ignores paths specified in .terraformignore
-		slug.AllowSymlinkTarget("/some/path"), // allow certain symlink target paths
+		slug.DereferenceSymlinks(),  // dereferences symlinks
+		slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore
 	)
 	if err != nil {
 		log.Fatal(err)
diff --git a/examples/registry_modules/main.go b/examples/registry_modules/main.go
@@ -22,9 +22,8 @@ func main() {
 	}
 
 	packer, err := slug.NewPacker(
-		slug.DereferenceSymlinks(),            // dereferences symlinks
-		slug.ApplyTerraformIgnore(),           // ignores paths specified in .terraformignore
-		slug.AllowSymlinkTarget("/some/path"), // allow certain symlink target paths
+		slug.DereferenceSymlinks(),  // dereferences symlinks
+		slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore
 	)
 	if err != nil {
 		log.Fatal(err)
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/google/go-querystring v1.1.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-retryablehttp v0.7.7
-	github.com/hashicorp/go-slug v0.16.0
+	github.com/hashicorp/go-slug v0.16.3
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/jsonapi v1.3.2
diff --git a/go.sum b/go.sum
@@ -10,8 +10,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/S
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
 github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
 github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
-github.com/hashicorp/go-slug v0.16.0 h1:S/ko9fms1gf6305ktJNUKGxFmscZ+yWvAtsas0SYUyA=
-github.com/hashicorp/go-slug v0.16.0/go.mod h1:THWVTAXwJEinbsp4/bBRcmbaO5EYNLTqxbG4tZ3gCYQ=
+github.com/hashicorp/go-slug v0.16.3 h1:pe0PMwz2UWN1168QksdW/d7u057itB2gY568iF0E2Ns=
+github.com/hashicorp/go-slug v0.16.3/go.mod h1:THWVTAXwJEinbsp4/bBRcmbaO5EYNLTqxbG4tZ3gCYQ=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
diff --git a/registry_module_integration_test.go b/registry_module_integration_test.go
@@ -1763,7 +1763,6 @@ func TestRegistryModulesUploadTarGzip(t *testing.T) {
 		packer, err := slug.NewPacker(
 			slug.DereferenceSymlinks(),
 			slug.ApplyTerraformIgnore(),
-			slug.AllowSymlinkTarget("/target/symlink/path/foo"),
 		)
 		require.NoError(t, err)
 

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,6 @@ func TestConfigurationVersionsUploadTarGzip(t *testing.T) {`
`311`	`311`	`packer, err := slug.NewPacker(`
`312`	`312`	`slug.DereferenceSymlinks(),`
`313`	`313`	`slug.ApplyTerraformIgnore(),`
`314`		`- slug.AllowSymlinkTarget("/target/symlink/path/foo"),`
`315`	`314`	`)`
`316`	`315`	`require.NoError(t, err)`
`317`	`316`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,8 @@ func ExampleConfigurationVersions_UploadTarGzip() {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`packer, err := slug.NewPacker(`
`93`		`- slug.DereferenceSymlinks(), // dereferences symlinks`
`94`		`- slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore`
`95`		`- slug.AllowSymlinkTarget("/some/path"), // allow certain symlink target paths`
	`93`	`+ slug.DereferenceSymlinks(), // dereferences symlinks`
	`94`	`+ slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore`
`96`	`95`	`)`
`97`	`96`	`if err != nil {`
`98`	`97`	`log.Fatal(err)`
`@@ -131,9 +130,8 @@ func ExampleRegistryModules_UploadTarGzip() {`
`131`	`130`	`}`
`132`	`131`
`133`	`132`	`packer, err := slug.NewPacker(`
`134`		`- slug.DereferenceSymlinks(), // dereferences symlinks`
`135`		`- slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore`
`136`		`- slug.AllowSymlinkTarget("/some/path"), // allow certain symlink target paths`
	`133`	`+ slug.DereferenceSymlinks(), // dereferences symlinks`
	`134`	`+ slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore`
`137`	`135`	`)`
`138`	`136`	`if err != nil {`
`139`	`137`	`log.Fatal(err)`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,8 @@ func main() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`packer, err := slug.NewPacker(`
`25`		`- slug.DereferenceSymlinks(), // dereferences symlinks`
`26`		`- slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore`
`27`		`- slug.AllowSymlinkTarget("/some/path"), // allow certain symlink target paths`
	`25`	`+ slug.DereferenceSymlinks(), // dereferences symlinks`
	`26`	`+ slug.ApplyTerraformIgnore(), // ignores paths specified in .terraformignore`
`28`	`27`	`)`
`29`	`28`	`if err != nil {`
`30`	`29`	`log.Fatal(err)`
Original file line number	Diff line number	Diff line change
`@@ -1763,7 +1763,6 @@ func TestRegistryModulesUploadTarGzip(t *testing.T) {`
`1763`	`1763`	`packer, err := slug.NewPacker(`
`1764`	`1764`	`slug.DereferenceSymlinks(),`
`1765`	`1765`	`slug.ApplyTerraformIgnore(),`
`1766`		`- slug.AllowSymlinkTarget("/target/symlink/path/foo"),`
`1767`	`1766`	`)`
`1768`	`1767`	`require.NoError(t, err)`
`1769`	`1768`