update more files

Author: vik-nullify

pkg/merger/merger.go

@@ -79,28 +79,6 @@ func MergeConfigFiles(
 			}
 		}
 
-		if extraConfig.Integrations.AWS != nil {
-			if config.Integrations.AWS == nil {
-				config.Integrations.AWS = extraConfig.Integrations.AWS
-			} else {
-				config.Integrations.AWS.Enable = extraConfig.Integrations.AWS.Enable
-
-				config.Integrations.AWS.RoleNameToAssume = extraConfig.Integrations.AWS.RoleNameToAssume
-				config.Integrations.AWS.PrimaryAccountID = extraConfig.Integrations.AWS.PrimaryAccountID
-				config.Integrations.AWS.PrimaryRegion = extraConfig.Integrations.AWS.PrimaryRegion
-
-				if extraConfig.Integrations.AWS.PrimaryRegion != "" {
-					config.Integrations.AWS.PrimaryRegion = extraConfig.Integrations.AWS.PrimaryRegion
-				}
-				if extraConfig.Integrations.AWS.TargetRegions != nil {
-					config.Integrations.AWS.TargetRegions = extraConfig.Integrations.AWS.TargetRegions
-				}
-				if extraConfig.Integrations.AWS.TargetAccounts != nil {
-					config.Integrations.AWS.TargetAccounts = extraConfig.Integrations.AWS.TargetAccounts
-				}
-			}
-		}
-
 		if len(extraConfig.IgnoreDirs) > 0 {
 			config.IgnoreDirs = extraConfig.IgnoreDirs
 		}

pkg/models/integrations.go

@@ -2,7 +2,6 @@ package models
 
 type Integrations struct {
 	Jira *Jira `yaml:"jira,omitempty"`
-	AWS  *AWS  `yaml:"aws,omitempty"`
 }
 
 type Jira struct {
@@ -32,12 +31,3 @@ type Assignee struct {
 	Name string `yaml:"name,omitempty"`
 	ID   string `yaml:"id,omitempty"`
 }
-
-type AWS struct {
-	Enable           bool      `yaml:"enable"`
-	RoleNameToAssume string    `yaml:"role_name_to_assume"`
-	PrimaryAccountID string    `yaml:"primary_account_id"`
-	PrimaryRegion    string    `yaml:"primary_region"`
-	TargetRegions    *[]string `yaml:"target_regions,omitempty"`
-	TargetAccounts   *[]string `yaml:"target_accounts,omitempty"`
-}