Address review comments

Author: outcomes-winter-rakhulsprakash

cfn-resources/federated-settings-identity-provider/cmd/resource/handlers.go

@@ -45,8 +45,8 @@ func HandleCreate(client *util.MongoDBClient, currentModel *Model) handler.Progr
 		)
 	}
 
-	createdID := created.GetId()
-	currentModel.IdpId = &createdID
+	currentModel.IdpId = util.Pointer(created.GetId())
+
 	return HandleRead(client, currentModel)
 }
 
@@ -77,14 +77,8 @@ func HandleUpdate(client *util.MongoDBClient, prevModel *Model, currentModel *Mo
 	federationSettingsID := util.SafeString(currentModel.FederationSettingsId)
 	idpID := util.SafeString(currentModel.IdpId)
 
-	associatedDomains := currentModel.AssociatedDomains
-	if associatedDomains == nil {
-		associatedDomains = []string{}
-	}
-	requestedScopes := currentModel.RequestedScopes
-	if requestedScopes == nil {
-		requestedScopes = []string{}
-	}
+	associatedDomains := getStringSliceOrEmpty(currentModel.AssociatedDomains)
+	requestedScopes := getStringSliceOrEmpty(currentModel.RequestedScopes)
 
 	updateReq := &admin.FederationIdentityProviderUpdate{
 		AssociatedDomains:          &associatedDomains,

cfn-resources/federated-settings-identity-provider/cmd/resource/mappings.go

@@ -33,6 +33,13 @@ var (
 	allIdpTypes  = []string{IdpTypeWorkforce, IdpTypeWorkload}
 )
 
+func getStringSliceOrEmpty(slice []string) []string {
+	if slice != nil {
+		return slice
+	}
+	return []string{}
+}
+
 func GetFederatedSettingsIdentityProviderModel(api *admin.FederationIdentityProvider, currentModel *Model) *Model {
 	var model *Model
 	if currentModel != nil {
@@ -49,56 +56,40 @@ func GetFederatedSettingsIdentityProviderModel(api *admin.FederationIdentityProv
 		model.OktaIdpId = oktaID
 	}
 
-	idpID := api.GetId()
-	model.IdpId = &idpID
+	model.IdpId = util.Pointer(api.GetId())
+	model.Name = util.Pointer(api.GetDisplayName())
+	model.IssuerUri = util.Pointer(api.GetIssuerUri())
+	model.Protocol = util.Pointer(api.GetProtocol())
+	model.Description = util.Pointer(api.GetDescription())
+	model.AuthorizationType = util.Pointer(api.GetAuthorizationType())
+	model.IdpType = util.Pointer(api.GetIdpType())
 
-	displayName := api.GetDisplayName()
-	model.Name = &displayName
-	issuerURI := api.GetIssuerUri()
-	model.IssuerUri = &issuerURI
 	protocol := api.GetProtocol()
-	model.Protocol = &protocol
-
-	description := api.GetDescription()
-	model.Description = &description
-	authorizationType := api.GetAuthorizationType()
-	model.AuthorizationType = &authorizationType
-	idpType := api.GetIdpType()
-	model.IdpType = &idpType
-
 	switch protocol {
 	case ProtocolSAML:
-		requestBinding := api.GetRequestBinding()
-		model.RequestBinding = &requestBinding
-		responseSignatureAlgorithm := api.GetResponseSignatureAlgorithm()
-		model.ResponseSignatureAlgorithm = &responseSignatureAlgorithm
+		model.RequestBinding = util.Pointer(api.GetRequestBinding())
+		model.ResponseSignatureAlgorithm = util.Pointer(api.GetResponseSignatureAlgorithm())
 		model.SsoDebugEnabled = api.SsoDebugEnabled
-		ssoURL := api.GetSsoUrl()
-		model.SsoUrl = &ssoURL
-		status := api.GetStatus()
-		model.Status = &status
+		model.SsoUrl = util.Pointer(api.GetSsoUrl())
+		model.Status = util.Pointer(api.GetStatus())
 
 		associatedDomains := api.GetAssociatedDomains()
 		if len(associatedDomains) == 0 && currentModel != nil && len(currentModel.AssociatedDomains) > 0 {
 			associatedDomains = currentModel.AssociatedDomains
 		}
 		model.AssociatedDomains = associatedDomains
 	case ProtocolOIDC:
-		audience := api.GetAudience()
-		model.Audience = &audience
-		clientID := api.GetClientId()
-		model.ClientId = &clientID
-		groupsClaim := api.GetGroupsClaim()
-		model.GroupsClaim = &groupsClaim
+		model.Audience = util.Pointer(api.GetAudience())
+		model.ClientId = util.Pointer(api.GetClientId())
+		model.GroupsClaim = util.Pointer(api.GetGroupsClaim())
 
 		requestedScopes := api.GetRequestedScopes()
 		if len(requestedScopes) == 0 && currentModel != nil && len(currentModel.RequestedScopes) > 0 {
 			requestedScopes = currentModel.RequestedScopes
 		}
 		model.RequestedScopes = requestedScopes
 
-		userClaim := api.GetUserClaim()
-		model.UserClaim = &userClaim
+		model.UserClaim = util.Pointer(api.GetUserClaim())
 
 		associatedDomains := api.GetAssociatedDomains()
 		if len(associatedDomains) == 0 && currentModel != nil && len(currentModel.AssociatedDomains) > 0 {
@@ -113,18 +104,8 @@ func GetFederatedSettingsIdentityProviderModel(api *admin.FederationIdentityProv
 }
 
 func ExpandOIDCCreateRequest(model *Model) *admin.FederationOidcIdentityProviderUpdate {
-	var associatedDomains []string
-	if model.AssociatedDomains != nil {
-		associatedDomains = model.AssociatedDomains
-	} else {
-		associatedDomains = []string{}
-	}
-	var requestedScopes []string
-	if model.RequestedScopes != nil {
-		requestedScopes = model.RequestedScopes
-	} else {
-		requestedScopes = []string{}
-	}
+	associatedDomains := getStringSliceOrEmpty(model.AssociatedDomains)
+	requestedScopes := getStringSliceOrEmpty(model.RequestedScopes)
 
 	return &admin.FederationOidcIdentityProviderUpdate{
 		Audience:          util.Pointer(util.SafeString(model.Audience)),

cfn-resources/federated-settings-identity-provider/cmd/resource/mappings_test.go

@@ -22,13 +22,18 @@ import (
 	"go.mongodb.org/atlas-sdk/v20250312012/admin"
 )
 
+const (
+	testIdpID  = "test-idp-id"
+	testOktaID = "test-okta-id"
+)
+
 func TestGetFederatedSettingsIdentityProviderModel_SAML(t *testing.T) {
 	protocol := "SAML"
 	displayName := "saml-name"
 	issuerURI := "https://issuer.example.com"
 	api := &admin.FederationIdentityProvider{
-		Id:                         "idp-1",
-		OktaIdpId:                  "okta-1",
+		Id:                         testIdpID,
+		OktaIdpId:                  testOktaID,
 		Protocol:                   &protocol,
 		DisplayName:                &displayName,
 		IssuerUri:                  &issuerURI,
@@ -42,8 +47,8 @@ func TestGetFederatedSettingsIdentityProviderModel_SAML(t *testing.T) {
 
 	model := resource.GetFederatedSettingsIdentityProviderModel(api, &resource.Model{})
 
-	assert.Equal(t, "idp-1", *model.IdpId)
-	assert.Equal(t, "okta-1", *model.OktaIdpId)
+	assert.Equal(t, testIdpID, *model.IdpId)
+	assert.Equal(t, testOktaID, *model.OktaIdpId)
 	assert.Equal(t, "SAML", *model.Protocol)
 	assert.Equal(t, "saml-name", *model.Name)
 	assert.Equal(t, "https://issuer.example.com", *model.IssuerUri)
@@ -63,8 +68,8 @@ func TestGetFederatedSettingsIdentityProviderModel_OIDC(t *testing.T) {
 	displayName := "oidc-name"
 	issuerURI := "https://issuer.oidc.example.com"
 	api := &admin.FederationIdentityProvider{
-		Id:                "idp-2",
-		OktaIdpId:         "okta-2",
+		Id:                testIdpID,
+		OktaIdpId:         testOktaID,
 		Protocol:          &protocol,
 		DisplayName:       &displayName,
 		IssuerUri:         &issuerURI,
@@ -78,8 +83,8 @@ func TestGetFederatedSettingsIdentityProviderModel_OIDC(t *testing.T) {
 
 	model := resource.GetFederatedSettingsIdentityProviderModel(api, &resource.Model{})
 
-	assert.Equal(t, "idp-2", *model.IdpId)
-	assert.Equal(t, "okta-2", *model.OktaIdpId)
+	assert.Equal(t, testIdpID, *model.IdpId)
+	assert.Equal(t, testOktaID, *model.OktaIdpId)
 	assert.Equal(t, "OIDC", *model.Protocol)
 	assert.Equal(t, "oidc-name", *model.Name)
 	assert.Equal(t, "https://issuer.oidc.example.com", *model.IssuerUri)