[APIE-921] Code refactor on CCloudV2 wrapper functions to follow {Operation}{Package}{Kind} function signature (internal)

internal/flink/command_endpoint_list.go

@@ -78,7 +78,7 @@ func (c *command) endpointList(cmd *cobra.Command, _ []string) error {
 
 	// 2 - List all the private endpoints based on the presence of "READY" PrivateLinkAttachments as filter
 	// Note the `cloud` and `region` parameters have to be `nil` instead of empty slice in case of no filter
-	platts, err := c.V2Client.ListPrivateLinkAttachments(environmentId, nil, nil, nil, []string{"READY"})
+	platts, err := c.V2Client.ListNetworkPrivateLinkAttachments(environmentId, nil, nil, nil, []string{"READY"})
 	if err != nil {
 		return fmt.Errorf("unable to list Flink endpoint, failed to list private link attachments: %w", err)
 	}

internal/flink/command_endpoint_use.go

@@ -96,7 +96,7 @@ func validateUserProvidedFlinkEndpoint(endpoint, cloud, region string, c *comman
 	}
 
 	// Check if the endpoint is PRIVATE associated with PLATT
-	platts, err := c.V2Client.ListPrivateLinkAttachments(c.Context.GetCurrentEnvironment(), nil, nil, nil, []string{"READY"})
+	platts, err := c.V2Client.ListNetworkPrivateLinkAttachments(c.Context.GetCurrentEnvironment(), nil, nil, nil, []string{"READY"})
 	if err != nil {
 		log.CliLogger.Debugf("Error listing PrivateLink attachments: %v", err)
 		return false

internal/iam/command.go

@@ -58,7 +58,7 @@ func autocompleteResourceOwners(client *ccloudv2.Client) []string {
 	if err != nil {
 		return nil
 	}
-	groupMappings, err := client.ListGroupMappings()
+	groupMappings, err := client.ListIamGroupMappings()
 	if err != nil {
 		return nil
 	}

internal/iam/command_certificate_authority_create.go

@@ -94,7 +94,7 @@ func (c *certificateAuthorityCommand) create(cmd *cobra.Command, args []string)
 		CrlChain:                 certificateauthorityv2.PtrString(crlChain),
 	}
 
-	certificateAuthority, err := c.V2Client.CreateCertificateAuthority(certRequest)
+	certificateAuthority, err := c.V2Client.CreateIamCertificateAuthority(certRequest)
 	if err != nil {
 		return err
 	}

internal/iam/command_certificate_authority_delete.go

@@ -32,7 +32,7 @@ func (c *certificateAuthorityCommand) newDeleteCommand() *cobra.Command {
 
 func (c *certificateAuthorityCommand) delete(cmd *cobra.Command, args []string) error {
 	existenceFunc := func(id string) bool {
-		_, err := c.V2Client.GetCertificateAuthority(id)
+		_, err := c.V2Client.GetIamCertificateAuthority(id)
 		return err == nil
 	}
 
@@ -41,7 +41,7 @@ func (c *certificateAuthorityCommand) delete(cmd *cobra.Command, args []string)
 	}
 
 	deleteFunc := func(id string) error {
-		return c.V2Client.DeleteCertificateAuthority(id)
+		return c.V2Client.DeleteIamCertificateAuthority(id)
 	}
 
 	_, err := deletion.Delete(cmd, args, deleteFunc, resource.CertificateAuthority)

internal/iam/command_certificate_authority_describe.go

@@ -22,7 +22,7 @@ func (c *certificateAuthorityCommand) newDescribeCommand() *cobra.Command {
 }
 
 func (c *certificateAuthorityCommand) describe(cmd *cobra.Command, args []string) error {
-	certificateAuthority, err := c.V2Client.GetCertificateAuthority(args[0])
+	certificateAuthority, err := c.V2Client.GetIamCertificateAuthority(args[0])
 	if err != nil {
 		return err
 	}

internal/iam/command_certificate_authority_list.go

@@ -22,7 +22,7 @@ func (c *certificateAuthorityCommand) newListCommand() *cobra.Command {
 }
 
 func (c *certificateAuthorityCommand) list(cmd *cobra.Command, _ []string) error {
-	certificateAuthorities, err := c.V2Client.ListCertificateAuthorities()
+	certificateAuthorities, err := c.V2Client.ListIamCertificateAuthorities()
 	if err != nil {
 		return err
 	}

internal/iam/command_certificate_authority_update.go

@@ -40,7 +40,7 @@ func (c *certificateAuthorityCommand) newUpdateCommand() *cobra.Command {
 
 func (c *certificateAuthorityCommand) update(cmd *cobra.Command, args []string) error {
 	// The update sends a PUT request, so we also need to send unchanged fields
-	currentCertificateAuthority, err := c.V2Client.GetCertificateAuthority(args[0])
+	currentCertificateAuthority, err := c.V2Client.GetIamCertificateAuthority(args[0])
 	if err != nil {
 		return err
 	}
@@ -94,7 +94,7 @@ func (c *certificateAuthorityCommand) update(cmd *cobra.Command, args []string)
 		update.CrlChain = certificateauthorityv2.PtrString(crlChain)
 	}
 
-	certificateAuthority, err := c.V2Client.UpdateCertificateAuthority(update)
+	certificateAuthority, err := c.V2Client.UpdateIamCertificateAuthority(update)
 	if err != nil {
 		return err
 	}

internal/iam/command_certificate_pool_create.go

@@ -80,7 +80,7 @@ func (c *certificatePoolCommand) create(cmd *cobra.Command, args []string) error
 		Filter:             certificateauthorityv2.PtrString(filter),
 		ExternalIdentifier: certificateauthorityv2.PtrString(externalIdentifier),
 	}
-	certificatePool, err := c.V2Client.CreateCertificatePool(createCertificatePool, provider, resourceOwner)
+	certificatePool, err := c.V2Client.CreateIamCertificatePool(createCertificatePool, provider, resourceOwner)
 	if err != nil {
 		return err
 	}

internal/iam/command_certificate_pool_delete.go

@@ -40,7 +40,7 @@ func (c *certificatePoolCommand) delete(cmd *cobra.Command, args []string) error
 	}
 
 	existenceFunc := func(id string) bool {
-		_, err := c.V2Client.GetCertificatePool(id, provider)
+		_, err := c.V2Client.GetIamCertificatePool(id, provider)
 		return err == nil
 	}
 
@@ -49,7 +49,7 @@ func (c *certificatePoolCommand) delete(cmd *cobra.Command, args []string) error
 	}
 
 	deleteFunc := func(id string) error {
-		return c.V2Client.DeleteCertificatePool(id, provider)
+		return c.V2Client.DeleteIamCertificatePool(id, provider)
 	}
 
 	_, err = deletion.Delete(cmd, args, deleteFunc, resource.CertificatePool)

internal/iam/command_certificate_pool_describe.go

@@ -35,7 +35,7 @@ func (c *certificatePoolCommand) describe(cmd *cobra.Command, args []string) err
 	if err != nil {
 		return nil
 	}
-	certificatePool, err := c.V2Client.GetCertificatePool(args[0], provider)
+	certificatePool, err := c.V2Client.GetIamCertificatePool(args[0], provider)
 	if err != nil {
 		return err
 	}

internal/iam/command_certificate_pool_list.go

@@ -29,7 +29,7 @@ func (c *certificatePoolCommand) list(cmd *cobra.Command, _ []string) error {
 		return nil
 	}
 
-	certificatePools, err := c.V2Client.ListCertificatePool(provider)
+	certificatePools, err := c.V2Client.ListIamCertificatePools(provider)
 	if err != nil {
 		return err
 	}

internal/iam/command_certificate_pool_update.go

@@ -44,7 +44,7 @@ func (c *certificatePoolCommand) update(cmd *cobra.Command, args []string) error
 	}
 
 	// The update sends a PUT request, so we also need to send unchanged fields
-	currentCertificatePool, err := c.V2Client.GetCertificatePool(args[0], provider)
+	currentCertificatePool, err := c.V2Client.GetIamCertificatePool(args[0], provider)
 	if err != nil {
 		return err
 	}
@@ -86,7 +86,7 @@ func (c *certificatePoolCommand) update(cmd *cobra.Command, args []string) error
 		update.ExternalIdentifier = certificateauthorityv2.PtrString(externalIdentifier)
 	}
 
-	certificatePool, err := c.V2Client.UpdateCertificatePool(update, provider)
+	certificatePool, err := c.V2Client.UpdateIamCertificatePool(update, provider)
 	if err != nil {
 		return err
 	}

internal/iam/command_groupmapping_create.go

@@ -47,7 +47,7 @@ func (c *groupMappingCommand) create(cmd *cobra.Command, args []string) error {
 		Description: ssov2.PtrString(description),
 		Filter:      ssov2.PtrString(filter),
 	}
-	groupMapping, err := c.V2Client.CreateGroupMapping(createGroupMapping)
+	groupMapping, err := c.V2Client.CreateIamGroupMapping(createGroupMapping)
 	if err != nil {
 		return err
 	}

internal/iam/command_groupmapping_delete.go

@@ -32,7 +32,7 @@ func (c *groupMappingCommand) newDeleteCommand() *cobra.Command {
 
 func (c *groupMappingCommand) delete(cmd *cobra.Command, args []string) error {
 	existenceFunc := func(id string) bool {
-		_, err := c.V2Client.GetGroupMapping(id)
+		_, err := c.V2Client.GetIamGroupMapping(id)
 		return err == nil
 	}
 
@@ -41,7 +41,7 @@ func (c *groupMappingCommand) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	deleteFunc := func(id string) error {
-		return c.V2Client.DeleteGroupMapping(id)
+		return c.V2Client.DeleteIamGroupMapping(id)
 	}
 
 	_, err := deletion.Delete(cmd, args, deleteFunc, resource.SsoGroupMapping)

internal/iam/command_groupmapping_describe.go

@@ -22,7 +22,7 @@ func (c *groupMappingCommand) newDescribeCommand() *cobra.Command {
 }
 
 func (c *groupMappingCommand) describe(cmd *cobra.Command, args []string) error {
-	groupMapping, err := c.V2Client.GetGroupMapping(args[0])
+	groupMapping, err := c.V2Client.GetIamGroupMapping(args[0])
 	if err != nil {
 		return err
 	}

internal/iam/command_groupmapping_list.go

@@ -22,7 +22,7 @@ func (c *groupMappingCommand) newListCommand() *cobra.Command {
 }
 
 func (c *groupMappingCommand) list(cmd *cobra.Command, _ []string) error {
-	groupMappings, err := c.V2Client.ListGroupMappings()
+	groupMappings, err := c.V2Client.ListIamGroupMappings()
 	if err != nil {
 		return err
 	}

internal/iam/command_groupmapping_update.go

@@ -62,7 +62,7 @@ func (c *groupMappingCommand) update(cmd *cobra.Command, args []string) error {
 		update.Filter = ssov2.PtrString(filter)
 	}
 
-	groupMapping, err := c.V2Client.UpdateGroupMapping(update)
+	groupMapping, err := c.V2Client.UpdateIamGroupMapping(update)
 	if err != nil {
 		return err
 	}

internal/iam/command_pool_create.go

@@ -82,7 +82,7 @@ func (c *poolCommand) create(cmd *cobra.Command, args []string) error {
 		IdentityClaim: identityproviderv2.PtrString(identityClaim),
 		Filter:        identityproviderv2.PtrString(filter),
 	}
-	pool, err := c.V2Client.CreateIdentityPool(createIdentityPool, provider, resourceOwner)
+	pool, err := c.V2Client.CreateIamIdentityPool(createIdentityPool, provider, resourceOwner)
 	if err != nil {
 		return err
 	}

internal/iam/command_pool_delete.go

@@ -40,7 +40,7 @@ func (c *poolCommand) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	existenceFunc := func(id string) bool {
-		_, err := c.V2Client.GetIdentityPool(id, provider)
+		_, err := c.V2Client.GetIamIdentityPool(id, provider)
 		return err == nil
 	}
 
@@ -49,7 +49,7 @@ func (c *poolCommand) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	deleteFunc := func(id string) error {
-		return c.V2Client.DeleteIdentityPool(id, provider)
+		return c.V2Client.DeleteIamIdentityPool(id, provider)
 	}
 
 	_, err = deletion.Delete(cmd, args, deleteFunc, resource.IdentityPool)

internal/iam/command_pool_describe.go

@@ -30,7 +30,7 @@ func (c *poolCommand) describe(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	pool, err := c.V2Client.GetIdentityPool(args[0], provider)
+	pool, err := c.V2Client.GetIamIdentityPool(args[0], provider)
 	if err != nil {
 		return err
 	}

internal/iam/command_pool_list.go

@@ -30,7 +30,7 @@ func (c *poolCommand) list(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	identityPools, err := c.V2Client.ListIdentityPools(provider)
+	identityPools, err := c.V2Client.ListIamIdentityPools(provider)
 	if err != nil {
 		return err
 	}

internal/iam/command_pool_update.go

@@ -78,7 +78,7 @@ func (c *poolCommand) update(cmd *cobra.Command, args []string) error {
 		updateIdentityPool.Filter = identityproviderv2.PtrString(filter)
 	}
 
-	pool, err := c.V2Client.UpdateIdentityPool(updateIdentityPool, provider)
+	pool, err := c.V2Client.UpdateIamIdentityPool(updateIdentityPool, provider)
 	if err != nil {
 		return err
 	}

internal/iam/command_provider_create.go

@@ -64,7 +64,7 @@ func (c *identityProviderCommand) create(cmd *cobra.Command, args []string) erro
 		Issuer:        identityproviderv2.PtrString(issuerUri),
 		JwksUri:       identityproviderv2.PtrString(jwksUri),
 	}
-	provider, err := c.V2Client.CreateIdentityProvider(createIdentityProvider)
+	provider, err := c.V2Client.CreateIamIdentityProvider(createIdentityProvider)
 	if err != nil {
 		return err
 	}

internal/iam/command_provider_delete.go

@@ -32,7 +32,7 @@ func (c *identityProviderCommand) newDeleteCommand() *cobra.Command {
 
 func (c *identityProviderCommand) delete(cmd *cobra.Command, args []string) error {
 	existenceFunc := func(id string) bool {
-		_, err := c.V2Client.GetIdentityProvider(id)
+		_, err := c.V2Client.GetIamIdentityProvider(id)
 		return err == nil
 	}
 
@@ -41,7 +41,7 @@ func (c *identityProviderCommand) delete(cmd *cobra.Command, args []string) erro
 	}
 
 	deleteFunc := func(id string) error {
-		return c.V2Client.DeleteIdentityProvider(id)
+		return c.V2Client.DeleteIamIdentityProvider(id)
 	}
 
 	_, err := deletion.Delete(cmd, args, deleteFunc, resource.IdentityProvider)

internal/iam/command_provider_describe.go

@@ -22,7 +22,7 @@ func (c *identityProviderCommand) newDescribeCommand() *cobra.Command {
 }
 
 func (c *identityProviderCommand) describe(cmd *cobra.Command, args []string) error {
-	provider, err := c.V2Client.GetIdentityProvider(args[0])
+	provider, err := c.V2Client.GetIamIdentityProvider(args[0])
 	if err != nil {
 		return err
 	}

internal/iam/command_provider_list.go

@@ -22,7 +22,7 @@ func (c *identityProviderCommand) newListCommand() *cobra.Command {
 }
 
 func (c *identityProviderCommand) list(cmd *cobra.Command, _ []string) error {
-	identityProviders, err := c.V2Client.ListIdentityProviders()
+	identityProviders, err := c.V2Client.ListIamIdentityProviders()
 	if err != nil {
 		return err
 	}

internal/iam/command_provider_update.go

@@ -62,7 +62,7 @@ func (c *identityProviderCommand) update(cmd *cobra.Command, args []string) erro
 		update.Description = identityproviderv2.PtrString(description)
 	}
 
-	provider, err := c.V2Client.UpdateIdentityProvider(update)
+	provider, err := c.V2Client.UpdateIamIdentityProvider(update)
 	if err != nil {
 		return err
 	}

internal/iam/command_rbac_role_binding_list.go

@@ -137,13 +137,13 @@ func (c *roleBindingCommand) list(cmd *cobra.Command, _ []string) error {
 }
 
 func (c *roleBindingCommand) getPoolToNameMap() (map[string]string, error) {
-	providers, err := c.V2Client.ListIdentityProviders()
+	providers, err := c.V2Client.ListIamIdentityProviders()
 	if err != nil {
 		return map[string]string{}, err
 	}
 	poolToName := make(map[string]string)
 	for _, provider := range providers {
-		pools, err := c.V2Client.ListIdentityPools(provider.GetId())
+		pools, err := c.V2Client.ListIamIdentityPools(provider.GetId())
 		if err != nil {
 			return map[string]string{}, err
 		}
@@ -155,7 +155,7 @@ func (c *roleBindingCommand) getPoolToNameMap() (map[string]string, error) {
 }
 
 func (c *roleBindingCommand) getGroupMappingToNameMap() (map[string]string, error) {
-	groupMappings, err := c.V2Client.ListGroupMappings()
+	groupMappings, err := c.V2Client.ListIamGroupMappings()
 	if err != nil {
 		return map[string]string{}, err
 	}

internal/login/command_test.go

@@ -628,7 +628,7 @@ func getNewLoginCommandForSelfSignedCertTest(req *require.Assertions, cfg *confi
 			transport, ok := mdsClient.GetConfig().HTTPClient.Transport.(*http.Transport)
 			req.True(ok)
 			req.NotEqual(http.DefaultTransport, transport)
-			found := slices.ContainsFunc(transport.TLSClientConfig.RootCAs.Subjects(), func(subject []byte) bool { //nolint:staticcheck
+			found := slices.ContainsFunc(transport.TLSClientConfig.RootCAs.Subjects(), func(subject []byte) bool { //nolint:staticcheck,nolintlint
 				return bytes.Equal(cert.RawSubject, subject)
 			})
 			req.True(found, "Certificate not found in client.")

internal/network/command_access_point_private_link_egress_endpoint.go

@@ -71,7 +71,7 @@ func (c *accessPointCommand) autocompleteEgressEndpoints() []string {
 		return nil
 	}
 
-	accessPoints, err := c.V2Client.ListAccessPoints(environmentId, nil)
+	accessPoints, err := c.V2Client.ListNetworkAccessPoints(environmentId, nil)
 	if err != nil {
 		return nil
 	}

internal/network/command_access_point_private_link_egress_endpoint_create.go

@@ -131,7 +131,7 @@ func (c *accessPointCommand) create(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	egressEndpoint, err := c.V2Client.CreateAccessPoint(createEgressEndpoint)
+	egressEndpoint, err := c.V2Client.CreateNetworkAccessPoint(createEgressEndpoint)
 	if err != nil {
 		return err
 	}

internal/network/command_access_point_private_link_egress_endpoint_delete.go

@@ -36,7 +36,7 @@ func (c *accessPointCommand) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	existenceFunc := func(id string) bool {
-		_, err := c.V2Client.GetAccessPoint(environmentId, id)
+		_, err := c.V2Client.GetNetworkAccessPoint(environmentId, id)
 		return err == nil
 	}
 
@@ -45,7 +45,7 @@ func (c *accessPointCommand) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	deleteFunc := func(id string) error {
-		return c.V2Client.DeleteAccessPoint(environmentId, id)
+		return c.V2Client.DeleteNetworkAccessPoint(environmentId, id)
 	}
 
 	deletedIds, err := deletion.DeleteWithoutMessage(cmd, args, deleteFunc)

internal/network/command_access_point_private_link_egress_endpoint_describe.go

@@ -35,7 +35,7 @@ func (c *accessPointCommand) describe(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	egressEndpoint, err := c.V2Client.GetAccessPoint(environmentId, args[0])
+	egressEndpoint, err := c.V2Client.GetNetworkAccessPoint(environmentId, args[0])
 	if err != nil {
 		return err
 	}