Merge branch 'master' into ceng-447-support-disabling-default-entitlement-token-without-import

BartoszBlizniak · web-flow · commit 51a19265cd6c · 2025-01-15T10:38:34.000Z
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ main.tf
 terraform.tfstate
 terraform.tfstate.backup
 terraform-provider-cloudsmith
+dist
+
diff --git a/cloudsmith/resource_saml_auth.go b/cloudsmith/resource_saml_auth.go
@@ -171,7 +171,7 @@ func setSAMLAuthFields(d *schema.ResourceData, organization string, samlAuth *cl
 
 	// Handle URL metadata with null handling
 	url, hasURL := samlAuth.GetSamlMetadataUrlOk()
-	if !hasURL || *url == "" {
+	if !hasURL || url == nil || *url == "" {
 		return setField("saml_metadata_url", nil)
 	}
 	return setField("saml_metadata_url", url)
@@ -185,7 +185,7 @@ func generateSAMLAuthID(organization string, samlAuth *cloudsmith.OrganizationSA
 		data += fmt.Sprintf("-%t", samlAuth.GetSamlAuthEnabled())
 		data += fmt.Sprintf("-%t", samlAuth.GetSamlAuthEnforced())
 
-		if url, hasURL := samlAuth.GetSamlMetadataUrlOk(); hasURL {
+		if url, hasURL := samlAuth.GetSamlMetadataUrlOk(); url != nil && hasURL {
 			data += fmt.Sprintf("-%s", *url)
 		}
 
diff --git a/docs/data-sources/organization_list_org_members.md b/docs/data-sources/organization_list_org_members.md

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ func setSAMLAuthFields(d schema.ResourceData, organization string, samlAuth cl`
`171`	`171`
`172`	`172`	`// Handle URL metadata with null handling`
`173`	`173`	`url, hasURL := samlAuth.GetSamlMetadataUrlOk()`
`174`		`- if !hasURL \|\| *url == "" {`
	`174`	`+ if !hasURL \|\| url == nil \|\| *url == "" {`
`175`	`175`	`return setField("saml_metadata_url", nil)`
`176`	`176`	`}`
`177`	`177`	`return setField("saml_metadata_url", url)`
`@@ -185,7 +185,7 @@ func generateSAMLAuthID(organization string, samlAuth *cloudsmith.OrganizationSA`
`185`	`185`	`data += fmt.Sprintf("-%t", samlAuth.GetSamlAuthEnabled())`
`186`	`186`	`data += fmt.Sprintf("-%t", samlAuth.GetSamlAuthEnforced())`
`187`	`187`
`188`		`- if url, hasURL := samlAuth.GetSamlMetadataUrlOk(); hasURL {`
	`188`	`+ if url, hasURL := samlAuth.GetSamlMetadataUrlOk(); url != nil && hasURL {`
`189`	`189`	`data += fmt.Sprintf("-%s", *url)`
`190`	`190`	`}`
`191`	`191`