Merge pull request #11 from piyushsonigra/fix/rule-not-exist-error

fix: sg rule doesnt exist error

Author: piyushsonigra

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: Build and Release aws_ipadd
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
   pull_request:
     branches:
       - main
@@ -26,7 +26,7 @@ jobs:
 
       - name: Build
         run: |
-          make build
+          RELEASE_VERSION="${{ github.ref_name }}" make build
 
       - name: Archive Build Artifact
         if: github.ref_type == 'tag'

Makefile

@@ -1,6 +1,7 @@
 BUILD_DIR := dist
 BIN_NAME := aws_ipadd
 PLATFORMS := darwin/amd64 darwin/arm64 linux/amd64 linux/arm64
+RELEASE_VERSION ?= dev
 
 clean:
 	@rm -rf $(BUILD_DIR)
@@ -12,8 +13,8 @@ build: clean
 		ARCH=$$(echo $$platform | cut -d'/' -f2); \
 		OUTPUT_FILE=$(BIN_NAME); \
 		ARTF_FILE=$(BIN_NAME)_$${OS}_$${ARCH}; \
-		echo "Building $$OUTPUT_FILE..."; \
-		GOOS=$$OS GOARCH=$$ARCH go build -o $(BUILD_DIR)/$$OUTPUT_FILE .; \
+		echo "Building $$ARTF_FILE ..."; \
+		GOOS=$$OS GOARCH=$$ARCH go build -ldflags "-X aws_ipadd/cliargs.Version=$(RELEASE_VERSION)" -o $(BUILD_DIR)/$$OUTPUT_FILE .; \
 		tar -czf $(BUILD_DIR)/$$ARTF_FILE.tar.gz -C $(BUILD_DIR) $$OUTPUT_FILE; \
 		rm -f $(BUILD_DIR)/$$OUTPUT_FILE; \
 	done

cliargs/cliargs.go

@@ -6,6 +6,9 @@ import (
 	"os"
 )
 
+// Version will be set during build time
+var Version = "dev"
+
 // Args stores command-line arguments.
 type Args struct {
 	Profile  string
@@ -30,13 +33,20 @@ func customUsage() {
 	fmt.Println("  --protocol <int>       Protocol e.g TCP, UPD, all (optional)")
 	fmt.Println("  --ip <string>          IP address with subnetmask e.g '10.10.19.1/32' (optional)")
 	fmt.Println("  --rule_name <string>   Security group rule name (optional)")
+	fmt.Println("  --help, -h <string>    Show help")
+	fmt.Println("  --version, -v <string> Show aws_ipadd version")
 }
 
 // Parse CLI Arguments
 func ParseArgs() *Args {
 	args := &Args{}
 	flag.Usage = customUsage
 
+	// Add version flag
+	versionFlag := flag.Bool("version", false, "Show aws_ipadd version")
+	// Add short version flag
+	vShort := flag.Bool("v", false, "Show aws_ipadd version")
+
 	flag.StringVar(&args.Profile, "profile", "", "AWS profile name (required)")
 	flag.StringVar(&args.Port, "port", "", "Port number, this will be ignored if from_port and to_port is passed (optional)")
 	flag.StringVar(&args.FromPort, "from_port", "", "Port number, It should be passed with to_port. Only from_port is not valid argument (optional)")
@@ -47,6 +57,13 @@ func ParseArgs() *Args {
 
 	flag.Parse()
 
+	// Check for version
+	if *versionFlag || *vShort {
+		fmt.Printf("aws_ipadd version %s\n", Version)
+		os.Exit(0)
+	}
+
+	// Check for profile
 	if args.Profile == "" {
 		fmt.Println("Error: --profile is required")
 		flag.Usage()

configloader/config.go

@@ -70,9 +70,9 @@ func GetConfig(section *ini.Section, args *cliargs.Args) (*SecurityGroupRule, er
 
 	// Set rule name
 	if args.RuleName != "" {
-		rule.RuleName = args.RuleName
+		rule.RuleName = strings.TrimSpace(args.RuleName)
 	} else {
-		rule.RuleName = section.Key("rule_name").String()
+		rule.RuleName = strings.TrimSpace(section.Key("rule_name").String())
 	}
 
 	return rule, nil

securitygroup/rule.go

@@ -65,16 +65,18 @@ func ProcessRule(profile string, ruleConfig *configloader.SecurityGroupRule) (st
 
 	// Modify security group rule
 	if ruleNameMatched {
-		fmt.Println("Whitelisting your current IP...")
 		// Revoke old IP permission
-		res, err := revokeIPPermission(ec2Client, &ruleConfig.SecurityGroupID, newRule, *matchingRule.IpRanges[0].CidrIp)
-		if err != nil {
-			return "", err
+		if ruleConfig.RuleName != "" {
+			fmt.Println("Updating your current IP...")
+			res, err := revokeIPPermission(ec2Client, &ruleConfig.SecurityGroupID, newRule, *matchingRule.IpRanges[0].CidrIp)
+			if err != nil {
+				return "", err
+			}
+			fmt.Println(res)
 		}
-		fmt.Println(res)
 
 		// Allow new IP permission
-		res, err = allowIPPermission(ec2Client, &ruleConfig.SecurityGroupID, newRule, &ruleConfig.IP)
+		res, err := allowIPPermission(ec2Client, &ruleConfig.SecurityGroupID, newRule, &ruleConfig.IP)
 		if err != nil {
 			return "", err
 		}