feat: add support to dissect a CodeCommit URL into component parts (#31)

.github/dependabot.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Gemba Advantage
+# Copyright (c) 2022 Gemba Advantage
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

.github/stale.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Gemba Advantage
+# Copyright (c) 2022 Gemba Advantage
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Gemba Advantage
+# Copyright (c) 2022 Gemba Advantage
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -37,20 +37,22 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
+      - name: Install Task
+        uses: arduino/setup-task@v1
       - name: Lint
         uses: golangci/golangci-lint-action@v2
         with:
           skip-go-installation: true
       - name: Test
-        run: make test
+        run: task test
       - name: Code Coverage
         uses: codecov/codecov-action@v2.0.3
       - name: Build
-        run: make build
+        run: task build
       - name: Tag
         if: github.ref == 'refs/heads/main'
-        uses: gembaadvantage/uplift-action@v1
+        uses: gembaadvantage/uplift-action@v2.0.1
         with:
-          version: v0.7.0
+          args: release
         env:
           GITHUB_TOKEN: ${{ secrets.GH_UPLIFT }}

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Gemba Advantage
+# Copyright (c) 2022 Gemba Advantage
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

.golangci.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Gemba Advantage
+# Copyright (c) 2022 Gemba Advantage
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,8 @@ linters:
     - varcheck
 
 linters-settings:
-  gofmt:
-    simplify: true
+  gofumpt:
+    lang-version: "1.17"
+    extra-rules: true
   dupl:
     threshold: 400

.goreleaser.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Gemba Advantage
+# Copyright (c) 2022 Gemba Advantage
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -45,6 +45,7 @@ builds:
     ignore:
       - goos: darwin
         goarch: 386
+
 archives:
   - id: codecommit-sign-archive
     format: tar.gz
@@ -61,8 +62,10 @@ archives:
     files:
       - README.md
       - LICENSE
+
 signs:
   - artifacts: checksum
+
 brews:
   - name: codecommit-sign
     tap:
@@ -86,10 +89,19 @@ brews:
     test: |
       installed_version = shell_output("#{bin}/codecommit-sign version --short 2>&1")
       assert_match "v#{version}", installed_version
+
 scoop:
   bucket:
     owner: gembaadvantage
     name: scoops
   homepage: "https://github.com/gembaadvantage/codecommit-sign"
   description: "Generate a signed AWS V4 CodeCommit URL directly from an IAM role. No dedicated CodeCommit credentials needed"
   license: MIT
+
+rigs:
+  - rig:
+      owner: gembaadvantage
+      name: fish-food
+    homepage: "https://github.com/gembaadvantage/codecommit-sign"
+    description: "Generate a signed AWS V4 CodeCommit URL directly from an IAM role. No dedicated CodeCommit credentials needed"
+    license: MIT

.uplift.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Gemba Advantage
+# Copyright (c) 2022 Gemba Advantage
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -26,7 +26,9 @@ brew install codecommit-sign
 To use [Fish](https://gofi.sh/):
 
 ```sh
-gofish install codecommit-sign
+gofish rig add https://github.com/gembaadvantage/fish-food
+gofish install github.com/gembaadvantage/fish-food/codecommit-sign
+
 ```
 
 ### Scoop

Taskfile.yaml

@@ -0,0 +1,65 @@
+# Copyright (c) 2022 Gemba Advantage
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# in the Software without restriction, including without limitation the rights
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+version: "3"
+
+vars:
+  BINDIR: bin
+  BINNAME: codecommit-sign
+  GIT_COMMIT:
+    sh: git rev-parse HEAD
+  GIT_SHA:
+    sh: git rev-parse --short HEAD
+  GIT_BRANCH:
+    sh: git branch --show-current
+  LDFLAGS: >
+    -X github.com/gembaadvantage/codecommit-sign/internal/version.version=dev-{{.GIT_SHA}}
+    -X github.com/gembaadvantage/codecommit-sign/internal/version.gitCommit={{.GIT_COMMIT}}
+    -X github.com/gembaadvantage/codecommit-sign/internal/version.gitBranch={{.GIT_BRANCH}}
+    -X github.com/gembaadvantage/codecommit-sign/internal/version.buildDate={{now | date "2006-01-02T15:04:05Z07:00"}}
+
+tasks:
+  default:
+    desc: Runs all of the default tasks
+    cmds:
+      - task: clean
+      - task: lint
+      - task: test
+      - task: build
+
+  build:
+    desc: Build the uplift binary
+    cmds:
+      - go build -ldflags '-s -w {{.LDFLAGS}}' -o '{{.BINDIR}}/{{.BINNAME}}' ./cmd/codecommitsign
+
+  test:
+    desc: Run the tests
+    cmds:
+      - go test -race -vet=off -p 1 -covermode=atomic -coverprofile=coverage.out ./...
+
+  lint:
+    desc: Lint the code using golangci
+    cmds:
+      - golangci-lint run --timeout 5m0s
+
+  clean:
+    desc: Remove any built artifacts
+    cmds:
+      - rm -rf {{.BINDIR}}

cmd/codecommitsign/completion.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

cmd/codecommitsign/main.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cmd/codecommitsign/root.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -104,7 +104,7 @@ func (o signOptions) Run(out io.Writer) error {
 	// Detect if a GRC URL has been provided and translate
 	if strings.HasPrefix(o.CloneURL, "codecommit::") {
 		var terr error
-		o.CloneURL, terr = translate.FromGrc(o.CloneURL)
+		o.CloneURL, terr = translate.FromGRC(o.CloneURL)
 		if terr != nil {
 			return terr
 		}

cmd/codecommitsign/version.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

internal/version/build.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

pkg/awsv4/signer.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

pkg/awsv4/signer_test.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

pkg/translate/grc.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Gemba Advantage
+Copyright (c) 2022 Gemba Advantage
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,44 +23,27 @@ SOFTWARE.
 package translate
 
 import (
-	"errors"
 	"fmt"
-	"regexp"
-	"strings"
-)
-
-var (
-	urlRgx = regexp.MustCompile(`^https://(.+@)?git-codecommit\.(.+)\.amazonaws.com/v1/repos/(.+)$`)
-	grcRgx = regexp.MustCompile(`^codecommit::(.+)://(.+)$`)
 )
 
 // ToGrc translates a CodeCommit HTTPS URL to a compatible CodeCommit (git-remote-codecommit)
 // GRC based URL that can be used to fetch and push changes to a CodeCommit repository
-func ToGrc(url string) (string, error) {
-	m := urlRgx.FindStringSubmatch(url)
-	if len(m) < 4 {
-		return "", errors.New("malformed codecommit HTTPS URL")
+func ToGRC(url string) (string, error) {
+	rem, err := RemoteHTTPS(url)
+	if err != nil {
+		return "", err
 	}
 
-	region := m[2]
-	repo := m[len(m)-1]
-
-	return fmt.Sprintf("codecommit::%s://%s", region, repo), nil
+	return fmt.Sprintf("codecommit::%s://%s", rem.Region, rem.Repository), nil
 }
 
 // FromGrc translates a CodeCommit (git-remote-codecommit) GRC URL to a compatible HTTPS URL
 // that can be used to fetch and push changes to a CodeCommit repository
-func FromGrc(url string) (string, error) {
-	m := grcRgx.FindStringSubmatch(url)
-	if len(m) < 3 {
-		return "", errors.New("malformed codecommit grc URL")
-	}
-
-	region := m[1]
-	repo := m[len(m)-1]
-	if strings.Contains(repo, "@") {
-		repo = strings.Split(repo, "@")[1]
+func FromGRC(url string) (string, error) {
+	rem, err := RemoteGRC(url)
+	if err != nil {
+		return "", err
 	}
 
-	return fmt.Sprintf("https://git-codecommit.%s.amazonaws.com/v1/repos/%s", region, repo), nil
+	return fmt.Sprintf("https://git-codecommit.%s.amazonaws.com/v1/repos/%s", rem.Region, rem.Repository), nil
 }