chore: update golang constructs via go fix (#541)

Co-authored-by: Christian Lechner <22294087+lechnerc77@users.noreply.github.com>

Author: lechnerc77

Makefile

@@ -20,6 +20,9 @@ MAIN_PACKAGE=main.go
 build:
 	go build -v ./...
 
+fix:
+	go fix -v ./...
+
 install: build
 	go build -o $(BINARY_PATH) $(MAIN_PACKAGE)
 
@@ -37,4 +40,4 @@ docs:
 spellchecker:
 	#prerequisite: Install pyspelling and aspell
 	pyspelling -c .spellcheck.yml
-.PHONY: build install lint fmt test docs
+.PHONY: build fix install lint fmt test docs

cmd/cmdMarkdownHelper.go

@@ -179,8 +179,8 @@ func genMarkdownCustom(cmd *cobra.Command, w io.Writer, linkHandler func(string)
 
 	if len(cmd.Example) > 0 {
 		buf.WriteString("### Examples\n\n```bash\n")
-		lines := strings.Split(cmd.Example, "\n")
-		for _, line := range lines {
+		lines := strings.SplitSeq(cmd.Example, "\n")
+		for line := range lines {
 			buf.WriteString(formatCommandLine(line) + "\n")
 		}
 		buf.WriteString("```\n\n")

internal/btpcli/helper.go

@@ -20,7 +20,7 @@ func nthElementOrDefault[T any](slice []T, n int, defaultValue T) T {
 	return slice[n]
 }
 
-func doExecute[T interface{}](cliClient *v2Client, ctx context.Context, req *CommandRequest, options ...CommandOptions) (T, CommandResponse, error) {
+func doExecute[T any](cliClient *v2Client, ctx context.Context, req *CommandRequest, options ...CommandOptions) (T, CommandResponse, error) {
 	var obj T
 
 	res, err := cliClient.Execute(ctx, req, options...)

internal/btpcli/types/cis/globalaccount_response_object.go

@@ -38,7 +38,7 @@ type GlobalAccountResponseObject struct {
 	// The current state of the global account. * <b>STARTED:</b> CRUD operation on an entity has started. * <b>CREATING:</b> Creating entity operation is in progress. * <b>UPDATING:</b> Updating entity operation is in progress. * <b>MOVING:</b> Moving entity operation is in progress. * <b>PROCESSING:</b> A series of operations related to the entity is in progress. * <b>DELETING:</b> Deleting entity operation is in progress. * <b>OK:</b> The CRUD operation or series of operations completed successfully. * <b>PENDING REVIEW:</b> The processing operation has been stopped for reviewing and can be restarted by the operator. * <b>CANCELLED:</b> The operation or processing was canceled by the operator. * <b>CREATION_FAILED:</b> The creation operation failed, and the entity was not created or was created but cannot be used. * <b>UPDATE_FAILED:</b> The update operation failed, and the entity was not updated. * <b>PROCESSING_FAILED:</b> The processing operations failed. * <b>DELETION_FAILED:</b> The delete operation failed, and the entity was not deleted. * <b>MOVE_FAILED:</b> Entity could not be moved to a different location. * <b>MIGRATING:</b> Migrating entity from NEO to CF.
 	EntityState string `json:"entityState,omitempty"`
 	// The planned date that the global account expires. This is the same date as the Contract End Date, unless a manual adjustment has been made to the actual expiration date of the global account. Typically, this property is automatically populated only when a formal termination order is received from the CRM system. From a customer perspective, this date marks the start of the grace period, which is typically 30 days before the actual deletion of the account.
-	ExpiryDate Time `json:"expiryDate,omitempty"`
+	ExpiryDate Time `json:"expiryDate"`
 	// The geographic locations from where the global account can be accessed. * <b>STANDARD:</b> The global account can be accessed from any geographic location. * <b>EU_ACCESS:</b> The global account can be accessed only within locations in the EU.
 	GeoAccess string `json:"geoAccess"`
 	// The GUID of the directory's global account entity.
@@ -50,15 +50,15 @@ type GlobalAccountResponseObject struct {
 	// The type of license for the global account. The license type affects the scope of functions of the account. * <b>DEVELOPER:</b> For internal developer global accounts on Staging or Canary landscapes. * <b>CUSTOMER:</b> For customer global accounts. * <b>PARTNER:</b> For partner global accounts. * <b>INTERNAL_DEV:</b> For internal global accounts on the Dev landscape. * <b>INTERNAL_PROD:</b> For internal global accounts on the Live landscape. * <b>TRIAL:</b> For customer trial accounts.
 	LicenseType string `json:"licenseType"`
 	// The date the global account was last modified. Dates and times are in UTC format.
-	ModifiedDate Time `json:"modifiedDate,omitempty"`
+	ModifiedDate Time `json:"modifiedDate"`
 	// The origin of the account. * <b>ORDER:</b> Created by the Order Processing API or Submit Order wizard. * <b>OPERATOR:</b> Created by the Global Account wizard. * <b>REGION_SETUP:</b> Created automatically as part of the region setup.
 	Origin string `json:"origin,omitempty"`
 	// The GUID of the global account's parent entity. Typically this is the global account.
 	ParentGUID string `json:"parentGUID"`
 	// The Type of the global account's parent entity.
 	ParentType string `json:"parentType"`
 	// The date that an expired contract was renewed. Dates and times are in UTC format.
-	RenewalDate Time `json:"renewalDate,omitempty"`
+	RenewalDate Time `json:"renewalDate"`
 	// For internal accounts, the service for which the global account was created.
 	ServiceId string `json:"serviceId,omitempty"`
 	// Information about the state.

internal/btpcli/types/saas_manager_service/model_entitled_applications_response_object.go

@@ -16,7 +16,7 @@ type EntitledApplicationsResponseObject struct {
 	// The unique registration name of the deployed multitenant application as defined by the app developer.
 	AppName string `json:"appName,omitempty"`
 	// The application coordinates provided in metadata for customer-facing UIs.
-	ApplicationCoordinates *interface{} `json:"applicationCoordinates,omitempty"`
+	ApplicationCoordinates *any `json:"applicationCoordinates,omitempty"`
 	// The authentication provider of the multitenant application. * XSUAA is the SAP Authorization and Trust Management service that defines scopes and permissions for users as tenants at the global account level. * IAS is Identity Authentication Service that defines scopes and permissions for users in zones (common data isolation systems across systems, SaaS tenants, and services).
 	AuthenticationProvider string `json:"authenticationProvider,omitempty"`
 	// The state of the automation solution.
@@ -30,7 +30,7 @@ type EntitledApplicationsResponseObject struct {
 	// The commercial name of the deployed multitenant application as defined by the app developer.
 	CommercialAppName string `json:"commercialAppName,omitempty"`
 	// The date the subscription was created. Dates and times are in UTC format.
-	CreatedDate Time `json:"createdDate,omitempty"`
+	CreatedDate Time `json:"createdDate"`
 	// Whether the application was developed by a customer. If not, then the application is developed by the cloud operator, such as SAP.
 	CustomerDeveloped bool `json:"customerDeveloped,omitempty"`
 	// The description of the multitenant application for customer-facing UIs.
@@ -48,11 +48,11 @@ type EntitledApplicationsResponseObject struct {
 	// User-defined labels that are assigned as key-value pairs in a JSON array to the multitenant application subscription.  Example: {   \"Cost Center\": [\"19700626\"],   \"Department\": [\"Sales\"],   \"Contacts\": [\"name1@example.com\",\"name2@example.com\"],   \"EMEA\":[] }
 	Labels map[string][]string `json:"labels,omitempty"`
 	// JSON schema that describes the metadata that the consumer provide when subscribing to the application.
-	Metadata map[string]interface{} `json:"metadata,omitempty"`
+	Metadata map[string]any `json:"metadata,omitempty"`
 	// The date the subscription was last modified. Dates and times are in UTC format.
-	ModifiedDate Time `json:"modifiedDate,omitempty"`
+	ModifiedDate Time `json:"modifiedDate"`
 	// JSON schema that describes the parameters that the consumer must provide when subscribing to the application.
-	ParamsSchema map[string]interface{} `json:"paramsSchema,omitempty"`
+	ParamsSchema map[string]any `json:"paramsSchema,omitempty"`
 	// The description of the plan for customer-facing UIs.
 	PlanDescription string `json:"planDescription,omitempty"`
 	// The plan name of the application to which the consumer has subscribed.

internal/btpcli/types/servicemanager/model_service_offering_response_object.go

@@ -41,7 +41,7 @@ type ServiceOfferingResponseObject struct {
 	// The catalog name of the service offering.
 	CatalogName string `json:"catalog_name,omitempty"`
 	// The time the service offering was created. <br> In ISO 8601 format:</br> YYYY-MM-DDThh:mm:ssTZD
-	CreatedAt time.Time `json:"created_at,omitempty"`
+	CreatedAt time.Time `json:"created_at"`
 	// The last time the service offering was updated. <br/> In ISO 8601 format.
-	UpdatedAt time.Time `json:"updated_at,omitempty"`
+	UpdatedAt time.Time `json:"updated_at"`
 }

internal/btpcli/types/servicemanager/model_service_plan_response_object.go

@@ -33,7 +33,7 @@ type ServicePlanResponseObject struct {
 	// The ID of the service offering.
 	ServiceOfferingId string `json:"service_offering_id,omitempty"`
 	// The time the service plan was created.<br> In ISO 8601 format:</br> YYYY-MM-DDThh:mm:ssTZD
-	CreatedAt time.Time `json:"created_at,omitempty"`
+	CreatedAt time.Time `json:"created_at"`
 	// The last time the service plan was updated.<br> In ISO 8601 format.
-	UpdatedAt time.Time `json:"updated_at,omitempty"`
+	UpdatedAt time.Time `json:"updated_at"`
 }

pkg/defaultfilter/defaultfilter.go

@@ -73,10 +73,10 @@ func FilterDefaultRoleCollectionsFromJsonData(subaccountId string, directoryID s
 	}
 
 	// Filter out the default role collections from the data
-	entities := data[dataSourceListKey].([]interface{})
+	entities := data[dataSourceListKey].([]any)
 
-	entities = slices.DeleteFunc(entities, func(value interface{}) bool {
-		entity := value.(map[string]interface{})
+	entities = slices.DeleteFunc(entities, func(value any) bool {
+		entity := value.(map[string]any)
 		return IsRoleCollectionInDefaultList(fmt.Sprintf("%v", entity[resourceKey]), defaultRoleCollectionNames)
 	})
 
@@ -148,10 +148,10 @@ func FilterDefaultRolesFromJsonData(subaccountId string, directoryID string, dat
 	}
 
 	// Filter out the default role collections from the data
-	entities := data[dataSourceListKey].([]interface{})
+	entities := data[dataSourceListKey].([]any)
 
-	entities = slices.DeleteFunc(entities, func(value interface{}) bool {
-		entity := value.(map[string]interface{})
+	entities = slices.DeleteFunc(entities, func(value any) bool {
+		entity := value.(map[string]any)
 		return IsRoleInDefaultList(fmt.Sprintf("%v", entity[resourceKey]), defaultRoles)
 	})
 
@@ -164,10 +164,10 @@ func FilterDefaultIdpJsonData(data map[string]any) map[string]any {
 	const resourceKey = "origin"
 
 	// Filter out the default role collections from the data
-	entities := data[dataSourceListKey].([]interface{})
+	entities := data[dataSourceListKey].([]any)
 
-	entities = slices.DeleteFunc(entities, func(value interface{}) bool {
-		entity := value.(map[string]interface{})
+	entities = slices.DeleteFunc(entities, func(value any) bool {
+		entity := value.(map[string]any)
 		return fmt.Sprintf("%v", entity[resourceKey]) == "sap.default"
 	})
 

pkg/tfcleanup/resource_processor/btp_subaccount_entitlement_processor.go

@@ -152,25 +152,26 @@ func addEntitlementVariables(variablesToCreate *generictools.VariableContent, en
 	variableInfo := "Object of entitlements to be assigned to the subaccount."
 	variableType := "map(list(string))"
 
-	defaultValue := "{\n"
+	var defaultValue strings.Builder
+	defaultValue.WriteString("{\n")
 	for key, info := range entitlementAddress {
 		serviceName := key.ServiceName
 		planName := key.PlanName
 		amount := info.Amount
 
 		if amount > 0 {
 			stringForValue := serviceName + "=[\"" + planName + "=" + strconv.Itoa(amount) + "\"]\n"
-			defaultValue += strings.ReplaceAll(stringForValue, " ", "")
+			defaultValue.WriteString(strings.ReplaceAll(stringForValue, " ", ""))
 		} else {
-			defaultValue += "\"" + serviceName + "\" = [\"" + planName + "\"]\n"
+			defaultValue.WriteString("\"" + serviceName + "\" = [\"" + planName + "\"]\n")
 		}
 	}
-	defaultValue += "}"
+	defaultValue.WriteString("}")
 
 	(*variablesToCreate)[variableName] = generictools.VariableInfo{
 		Description:  variableInfo,
 		Type:         variableType,
-		DefaultValue: defaultValue,
+		DefaultValue: defaultValue.String(),
 	}
 }
 

pkg/tfimportprovider/ITfimportprovider.go

@@ -2,5 +2,5 @@ package tfimportprovider
 
 type ITfImportProvider interface {
 	GetResourceType() string
-	GetImportBlock(data map[string]interface{}, levelId string, filterValues []string) (string, int, error)
+	GetImportBlock(data map[string]any, levelId string, filterValues []string) (string, int, error)
 }