feat: Set negative cache fields as required options (#458)

* feat: Set negative cache fields as required options following the Nexus API definition * fix: Fix all tests for data sources repository proxy
datadrivers · Aug 8, 2024 · fcc6686 · fcc6686
1 parent e0ec59f
commit fcc6686
Show file tree

Hide file tree

Showing 36 changed files with 87 additions and 27 deletions.
diff --git a/docs/resources/repository_apt_proxy.md b/docs/resources/repository_apt_proxy.md
@@ -121,7 +121,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_bower_proxy.md b/docs/resources/repository_bower_proxy.md
@@ -103,7 +103,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_cocoapods_proxy.md b/docs/resources/repository_cocoapods_proxy.md
@@ -100,7 +100,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_conan_proxy.md b/docs/resources/repository_conan_proxy.md
@@ -100,7 +100,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_conda_proxy.md b/docs/resources/repository_conda_proxy.md
@@ -100,7 +100,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_docker_proxy.md b/docs/resources/repository_docker_proxy.md
@@ -139,7 +139,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_go_proxy.md b/docs/resources/repository_go_proxy.md
@@ -101,7 +101,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_helm_proxy.md b/docs/resources/repository_helm_proxy.md
@@ -101,7 +101,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_maven_proxy.md b/docs/resources/repository_maven_proxy.md
@@ -120,7 +120,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_npm_proxy.md b/docs/resources/repository_npm_proxy.md
@@ -102,7 +102,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_nuget_proxy.md b/docs/resources/repository_nuget_proxy.md
@@ -105,7 +105,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_p2_proxy.md b/docs/resources/repository_p2_proxy.md
@@ -100,7 +100,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_pypi_proxy.md b/docs/resources/repository_pypi_proxy.md
@@ -100,7 +100,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_r_proxy.md b/docs/resources/repository_r_proxy.md
@@ -100,7 +100,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_raw_proxy.md b/docs/resources/repository_raw_proxy.md
@@ -101,7 +101,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_rubygems_proxy.md b/docs/resources/repository_rubygems_proxy.md
@@ -100,7 +100,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/docs/resources/repository_yum_proxy.md b/docs/resources/repository_yum_proxy.md
@@ -101,7 +101,7 @@ Optional:
 <a id="nestedblock--negative_cache"></a>
 ### Nested Schema for `negative_cache`
 
-Optional:
+Required:
 
 - `enabled` (Boolean) Whether to cache responses for content not present in the proxied repository
 - `ttl` (Number) How long to cache the fact that a file was not found in the repository (in minutes)

diff --git a/internal/acceptance/template-strings-repository.go b/internal/acceptance/template-strings-repository.go
@@ -118,16 +118,10 @@ group {
 `
 
 	TemplateStringNegativeCache = `
-{{ if .NegativeCache }}
 	negative_cache {
-		{{ if .NegativeCache.Enabled }}
 		enabled = {{ .NegativeCache.Enabled }}
-		{{ end -}}
-		{{ if .NegativeCache.TTL }}
 		ttl = {{ .NegativeCache.TTL }}
-		{{ end }}
 	}
-{{ end -}}
 `
 
 	TemplateStringProxy = `

diff --git a/internal/schema/repository/schema_negative_cache.go b/internal/schema/repository/schema_negative_cache.go
@@ -13,15 +13,13 @@ var (
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"enabled": {
-					Default:     false,
 					Description: "Whether to cache responses for content not present in the proxied repository",
-					Optional:    true,
+					Required:    true,
 					Type:        schema.TypeBool,
 				},
 				"ttl": {
-					Default:     1440,
 					Description: "How long to cache the fact that a file was not found in the repository (in minutes)",
-					Optional:    true,
+					Required:    true,
 					Type:        schema.TypeInt,
 				},
 			},

diff --git a/internal/services/repository/data_source_repository_apt_proxy_test.go b/internal/services/repository/data_source_repository_apt_proxy_test.go
@@ -32,6 +32,10 @@ func TestAccDataSourceRepositoryAptProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_apt_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_bower_proxy_test.go b/internal/services/repository/data_source_repository_bower_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryBowerProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 		Bower: repository.Bower{
 			RewritePackageUrls: false,
 		},

diff --git a/internal/services/repository/data_source_repository_cocoapods_proxy_test.go b/internal/services/repository/data_source_repository_cocoapods_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryCocoapodsProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_cocoapods_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_conan_proxy_test.go b/internal/services/repository/data_source_repository_conan_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryConanProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_conan_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_conda_proxy_test.go b/internal/services/repository/data_source_repository_conda_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryCondaProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_conda_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_docker_proxy_test.go b/internal/services/repository/data_source_repository_docker_proxy_test.go
@@ -42,6 +42,10 @@ func TestAccDataSourceRepositoryDockerProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 	repo.Docker.Subdomain = &subdomain
 	dataSourceName := "data.nexus_repository_docker_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_go_proxy_test.go b/internal/services/repository/data_source_repository_go_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryGoProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_go_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_helm_proxy_test.go b/internal/services/repository/data_source_repository_helm_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryHelmProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_helm_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_maven_proxy_test.go b/internal/services/repository/data_source_repository_maven_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryMavenProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 		Maven: repository.Maven{
 			VersionPolicy: repository.MavenVersionPolicyRelease,
 			LayoutPolicy:  repository.MavenLayoutPolicyStrict,

diff --git a/internal/services/repository/data_source_repository_npm_proxy_test.go b/internal/services/repository/data_source_repository_npm_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryNpmProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 		Npm: &repository.Npm{
 			RemoveNonCataloged: false,
 			RemoveQuarantined:  true,

diff --git a/internal/services/repository/data_source_repository_nuget_proxy_test.go b/internal/services/repository/data_source_repository_nuget_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryNugetProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 		NugetProxy: repository.NugetProxy{
 			NugetVersion:         repository.NugetVersion2,
 			QueryCacheItemMaxAge: 300,

diff --git a/internal/services/repository/data_source_repository_p2_proxy_test.go b/internal/services/repository/data_source_repository_p2_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryP2Proxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_p2_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_pypi_proxy_test.go b/internal/services/repository/data_source_repository_pypi_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryPypiProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_pypi_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_r_proxy_test.go b/internal/services/repository/data_source_repository_r_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryRProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_r_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_raw_proxy_test.go b/internal/services/repository/data_source_repository_raw_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryRawProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_raw_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_rubygems_proxy_test.go b/internal/services/repository/data_source_repository_rubygems_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryRubygemsProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_rubygems_proxy.acceptance"

diff --git a/internal/services/repository/data_source_repository_yum_proxy_test.go b/internal/services/repository/data_source_repository_yum_proxy_test.go
@@ -29,6 +29,10 @@ func TestAccDataSourceRepositoryYumProxy(t *testing.T) {
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
 		},
+		NegativeCache: repository.NegativeCache{
+			Enabled: true,
+			TTL:     5,
+		},
 	}
 
 	dataSourceName := "data.nexus_repository_yum_proxy.acceptance"