Isaac/mc schema fixes (#715)

* propagate an error * The collection returned by data sources must not be optional * Add more optionals --------- Co-authored-by: Matthew Casperson <matthewcasperson@gmail.com>
OctopusDeployLabs · Aug 8, 2024 · 3a8a027 · 3a8a027
1 parent 7c81ce9
commit 3a8a027
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 22 deletions.
diff --git a/octopusdeploy/data_source_tenants.go b/octopusdeploy/data_source_tenants.go
@@ -44,7 +44,10 @@ func dataSourceTenantsRead(ctx context.Context, d *schema.ResourceData, meta int
 		flattenedTenants = append(flattenedTenants, flattenTenant(tenant))
 	}
 
-	d.Set("tenants", flattenedTenants)
+	if err := d.Set("tenants", flattenedTenants); err != nil {
+		return diag.FromErr(err)
+	}
+
 	d.SetId("Tenants " + time.Now().UTC().String())
 
 	return nil

diff --git a/octopusdeploy/schema_account_resource.go b/octopusdeploy/schema_account_resource.go
@@ -50,6 +50,7 @@ func getAccountResourceDataSchema() map[string]*schema.Schema {
 			Description: "A list of accounts that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
 			Type:        schema.TypeList,
+			Optional:    false,
 		},
 		"id":           getDataSchemaID(),
 		"space_id":     getQuerySpaceID(),

diff --git a/octopusdeploy/schema_azure_cloud_service_deployment_target.go b/octopusdeploy/schema_azure_cloud_service_deployment_target.go
@@ -70,7 +70,7 @@ func getAzureCloudServiceDeploymentTargetDataSchema() map[string]*schema.Schema
 		Computed:    true,
 		Description: "A list of Azure cloud service deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_azure_service_fabric_cluster_deployment_target.go b/octopusdeploy/schema_azure_service_fabric_cluster_deployment_target.go
@@ -85,7 +85,7 @@ func getAzureServiceFabricClusterDeploymentTargetDataSchema() map[string]*schema
 		Computed:    true,
 		Description: "A list of Azure service fabric cluster deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_azure_web_app_deployment_target.go b/octopusdeploy/schema_azure_web_app_deployment_target.go
@@ -55,7 +55,7 @@ func getAzureWebAppDeploymentTargetDataSchema() map[string]*schema.Schema {
 		Computed:    true,
 		Description: "A list of Azure web app deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_certificate.go b/octopusdeploy/schema_certificate.go
@@ -170,7 +170,7 @@ func getCertificateDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of certificates that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 		"first_result": getQueryFirstResult(),

diff --git a/octopusdeploy/schema_channel.go b/octopusdeploy/schema_channel.go
@@ -73,7 +73,7 @@ func getChannelDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A channel that matches the specified filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 		"ids":          getQueryIDs(),

diff --git a/octopusdeploy/schema_cloud_region_deployment_target.go b/octopusdeploy/schema_cloud_region_deployment_target.go
@@ -40,7 +40,7 @@ func getCloudRegionDeploymentTargetDataSchema() map[string]*schema.Schema {
 		Computed:    true,
 		Description: "A list of cloud region deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_deployment_target.go b/octopusdeploy/schema_deployment_target.go
@@ -90,7 +90,7 @@ func getDeploymentTargetDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of deployment targets that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 		"environments":    getQueryEnvironments(),

diff --git a/octopusdeploy/schema_kubernetes_agent_deployment_target.go b/octopusdeploy/schema_kubernetes_agent_deployment_target.go
@@ -173,7 +173,7 @@ func getKubernetesAgentDeploymentTargetDataSchema() map[string]*schema.Schema {
 		Computed:    true,
 		Description: "A list of kubernetes agent deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_kubernetes_cluster_deployment_target.go b/octopusdeploy/schema_kubernetes_cluster_deployment_target.go
@@ -131,7 +131,7 @@ func getKubernetesClusterDeploymentTargetDataSchema() map[string]*schema.Schema
 		Computed:    true,
 		Description: "A list of Kubernetes cluster deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_listening_tentacle_deployment_target.go b/octopusdeploy/schema_listening_tentacle_deployment_target.go
@@ -57,7 +57,7 @@ func getListeningTentacleDeploymentTargetDataSchema() map[string]*schema.Schema
 		Computed:    true,
 		Description: "A list of listening tentacle deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_machine_policy.go b/octopusdeploy/schema_machine_policy.go
@@ -112,7 +112,7 @@ func getMachinePolicyDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of machine policies that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 		"partial_name": getQueryPartialName(),

diff --git a/octopusdeploy/schema_offline_package_drop_deployment_target.go b/octopusdeploy/schema_offline_package_drop_deployment_target.go
@@ -51,7 +51,7 @@ func getOfflinePackageDropDeploymentTargetDataSchema() map[string]*schema.Schema
 		Computed:    true,
 		Description: "A list of offline package drop deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_polling_tentacle_deployment_target.go b/octopusdeploy/schema_polling_tentacle_deployment_target.go
@@ -51,7 +51,7 @@ func getPollingTentacleDeploymentTargetDataSchema() map[string]*schema.Schema {
 		Computed:    true,
 		Description: "A list of polling tentacle deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_script_modules.go b/octopusdeploy/schema_script_modules.go
@@ -86,7 +86,7 @@ func getScriptModuleDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of script modules that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 		"partial_name": getQueryPartialName(),

diff --git a/octopusdeploy/schema_ssh_connection_deployment_target.go b/octopusdeploy/schema_ssh_connection_deployment_target.go
@@ -57,7 +57,7 @@ func getSSHConnectionDeploymentTargetDataSchema() map[string]*schema.Schema {
 		Computed:    true,
 		Description: "A list of SSH connection deployment targets that match the filter(s).",
 		Elem:        &schema.Resource{Schema: dataSchema},
-		Optional:    true,
+		Optional:    false,
 		Type:        schema.TypeList,
 	}
 

diff --git a/octopusdeploy/schema_tag_set.go b/octopusdeploy/schema_tag_set.go
@@ -54,7 +54,7 @@ func getTagSetDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of tag sets that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 		"take":     getQueryTake(),

diff --git a/octopusdeploy/schema_team.go b/octopusdeploy/schema_team.go
@@ -85,7 +85,7 @@ func getTeamDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of teams that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 	}

diff --git a/octopusdeploy/schema_tenant.go b/octopusdeploy/schema_tenant.go
@@ -67,7 +67,7 @@ func getTenantDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of tenants that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 		"take": getQueryTake(),

diff --git a/octopusdeploy/schema_user.go b/octopusdeploy/schema_user.go
@@ -74,7 +74,7 @@ func getUserDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of users that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 	}

diff --git a/octopusdeploy/schema_user_role.go b/octopusdeploy/schema_user_role.go
@@ -84,7 +84,7 @@ func getUserRoleDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of user roles that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 	}

diff --git a/octopusdeploy/schema_worker_pool.go b/octopusdeploy/schema_worker_pool.go
@@ -39,7 +39,7 @@ func getWorkerPoolDataSchema() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "A list of worker pools that match the filter(s).",
 			Elem:        &schema.Resource{Schema: dataSchema},
-			Optional:    true,
+			Optional:    false,
 			Type:        schema.TypeList,
 		},
 	}

diff --git a/octopusdeploy_framework/schemas/gitCredential.go b/octopusdeploy_framework/schemas/gitCredential.go
@@ -54,6 +54,7 @@ func GetGitCredentialDataSourceSchema() map[string]datasourceSchema.Attribute {
 		"take":     util.GetQueryTakeDatasourceSchema(),
 		"git_credentials": datasourceSchema.ListNestedAttribute{
 			Computed:    true,
+			Optional:    false,
 			Description: "A list of Git Credentials that match the filter(s).",
 			NestedObject: datasourceSchema.NestedAttributeObject{
 				Attributes: GetGitCredentialAttributes(),

diff --git a/octopusdeploy_framework/schemas/lifecycle.go b/octopusdeploy_framework/schemas/lifecycle.go
@@ -97,6 +97,7 @@ func GetDatasourceLifecycleSchema() datasourceSchema.Schema {
 			"take":         util.GetQueryTakeDatasourceSchema(),
 			"lifecycles": datasourceSchema.ListNestedAttribute{
 				Computed: true,
+				Optional: false,
 				NestedObject: datasourceSchema.NestedAttributeObject{
 					Attributes: map[string]datasourceSchema.Attribute{
 						"id":                        util.GetIdDatasourceSchema(),

diff --git a/octopusdeploy_framework/schemas/project.go b/octopusdeploy_framework/schemas/project.go
@@ -193,6 +193,7 @@ func getProjectsDataSourceAttribute() datasourceSchema.ListNestedAttribute {
 	return datasourceSchema.ListNestedAttribute{
 		Description: "A list of projects that match the filter(s).",
 		Computed:    true,
+		Optional:    false,
 		NestedObject: datasourceSchema.NestedAttributeObject{
 			Attributes: map[string]datasourceSchema.Attribute{
 				"allow_deployments_to_no_targets":            util.DataSourceBool().Computed().Deprecated("Allow deployments to be created when there are no targets.").Build(),