CB-32728 AWS Region Exclude

Author: kergyik

aws/aws.go

@@ -1839,7 +1839,15 @@ func getCFStacks(cloudType types.CloudType, cfClients map[string]cfClient) ([]*t
 				log.Debugf("[AWS] Processing stacks (%d) in region: %s: [%s]", len(stackResult.Stacks), region, stackResult.Stacks)
 				for _, s := range stackResult.Stacks {
 					stack := newStack(cloudType, s, region)
-					cfChan <- stack
+					if ctx.WorkaroundAwsIgnoreStack {
+						if !strings.HasPrefix(stack.Name, "StackSet-") {
+							cfChan <- stack
+						} else {
+							log.Infof("Ignoring stackset %s", stack.Name)
+						}
+					} else {
+						cfChan <- stack
+					}
 				}
 				if stackResult.NextToken != nil {
 					nextToken = *stackResult.NextToken
@@ -2508,7 +2516,7 @@ func getRegions(ec2Client ec2Client) ([]string, error) {
 	regions := make([]string, 0)
 	for _, region := range regionResult.Regions {
 		// CB-32728 Remove the me-south-1 region
-		if strings.EqualFold(*region.RegionName, "me-south-1") {
+		if ctx.AwsExcludedRegions[strings.ToLower(*region.RegionName)] {
 			log.Infof("[AWS] Skipping CloudFormation fetch from region: %s", *region.RegionName)
 			continue
 		}

context/context.go

@@ -44,6 +44,10 @@ var IgnoreLabelDisabled = false
 // ExactMatchOwner is a global flag for 'exact match' or 'starts with' matching of owner
 var ExactMatchOwner = false
 
+var WorkaroundAwsIgnoreStack = false
+
+var AwsExcludedRegions = make(map[string]bool)
+
 // Operations contains all the available operations
 var Operations = make(map[types.OpType]types.Operation)
 

main.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"os"
 	"sort"
+	"strings"
 
 	"github.com/hortonworks/cloud-haunter/utils"
 
@@ -38,9 +39,13 @@ func main() {
 	verbose := flag.Bool("v", false, "verbose")
 	ignoreLabelDisabled := flag.Bool("i", false, "disable ignore label")
 	exactMatchOwner := flag.Bool("e", false, "exact match owner")
+	workaroundAWsIgnoreStack := flag.Bool("awsignore", false, "AWS stack ignore workaround")
+	excludedAwsRegions := flag.String("excludeAwsRegion", "", "comma separated list of AWS regions to exclude")
 
 	flag.Parse()
 
+	parseRegionsStr(*excludedAwsRegions)
+
 	if *help {
 		printHelp()
 		os.Exit(0)
@@ -53,6 +58,7 @@ func main() {
 	}
 	ctx.IgnoreLabelDisabled = *ignoreLabelDisabled
 	ctx.ExactMatchOwner = *exactMatchOwner
+	ctx.WorkaroundAwsIgnoreStack = *workaroundAWsIgnoreStack
 
 	if filterConfigLoc != nil && len(*filterConfigLoc) != 0 {
 		var err error
@@ -119,6 +125,7 @@ func main() {
 		items = filter.Execute(items)
 	}
 	action.Execute(*op, filterNames, items)
+	println("All operations completed.")
 }
 
 // should be kept in sync with README.md
@@ -182,3 +189,10 @@ func getSortedActions() []string {
 	sort.Strings(actions)
 	return actions
 }
+
+func parseRegionsStr(regionsStr string) {
+	regionList := strings.Split(regionsStr, ",")
+	for _, item := range regionList {
+		ctx.AwsExcludedRegions[strings.ToLower(item)] = true
+	}
+}

release.sh

@@ -8,17 +8,25 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD)
 rm -rf release
 mkdir release
 
+TAR=tar
+GREP=grep
+# On OS X refer to the gnu utils, they can be installed using brew
+if [[ $OSTYPE =~ "darwin" ]]; then
+  TAR=gtar
+  GREP=ggrep
+fi
+
 declare -a Platforms=("Linux" "Darwin")
 for platform in ${Platforms[@]}; do
   if [ -d "./build/$platform" ]; then
     echo "Compressing the ${platform} relevant binary ..."
-    tar -zcf "release/${NAME}_${VERSION}_${platform}_${ARCH}.tgz" -C build/$platform $BINARY
+    $TAR -zcf "release/${NAME}_${VERSION}_${platform}_${ARCH}.tgz" -C build/$platform $BINARY
   fi
 done
 
 echo "Creating release v${VERSION} from branch $BRANCH ..."
 
-output=$(gh release list | grep ${VERSION})
+output=$(gh release list | $GREP ${VERSION})
 if [ -z "$output" ]; then 
   gh release create "v${VERSION}" "./release/${NAME}_${VERSION}_Linux_${ARCH}.tgz" "./release/${NAME}_${VERSION}_Darwin_${ARCH}.tgz" -t ${VERSION} -n ""
 else