code refactor + change regex for github url validation

Co-Authored-By: Joe Eltgroth <[email protected]> Co-Authored-By: Christopher Hunter <[email protected]>
pivotal-cf · Oct 7, 2024 · 2f28fba · 2f28fba
1 parent 835c7e3
commit 2f28fba
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 8 deletions.
diff --git a/internal/acceptance/README.md b/internal/acceptance/README.md
@@ -25,8 +25,11 @@ go run github.com/onsi/ginkgo/ginkgo
 ### Workflows
 These are written in Go and use [godog](https://github.com/cucumber/godog) (a Cucumber test framework).
 
+> PS: Export GITHUB_TOKEN as an env var before running the acceptance tests
+
 ```bash
 # from anywhere in the repo you can run:
+export GITHUB_TOKEN="$(gh auth token)"
 go test -v --tags acceptance --timeout=1h github.com/pivotal-cf/kiln/internal/acceptance/workflows
 ```
 

diff --git a/internal/commands/update_release.go b/internal/commands/update_release.go
@@ -78,7 +78,6 @@ func (u UpdateRelease) Execute(args []string) error {
 			StemcellOS:       kilnfileLock.Stemcell.OS,
 			GitHubRepository: releaseSpec.GitHubRepository,
 		}, false)
-
 		if err != nil {
 			if component.IsErrNotFound(err) {
 				return fmt.Errorf("error finding the release: %w", err)
@@ -99,7 +98,6 @@ func (u UpdateRelease) Execute(args []string) error {
 			StemcellVersion:  kilnfileLock.Stemcell.Version,
 			GitHubRepository: releaseSpec.GitHubRepository,
 		})
-
 		if err != nil {
 			if component.IsErrNotFound(err) {
 				return fmt.Errorf("error finding the release: %w", err)

diff --git a/internal/commands/update_stemcell.go b/internal/commands/update_stemcell.go
@@ -48,7 +48,6 @@ func (update UpdateStemcell) Execute(args []string) error {
 
 	kilnStemcellVersion := kilnfile.Stemcell.Version
 	releaseVersionConstraint, err = semver.NewConstraint(kilnStemcellVersion)
-
 	if err != nil {
 		return fmt.Errorf("invalid stemcell constraint in kilnfile: %w", err)
 	}

diff --git a/internal/gh/uri.go b/internal/gh/uri.go
@@ -20,7 +20,7 @@ func RepositoryHostOwnerAndNameFromPath(urlStr string) (string, string, string,
 		return fmt.Errorf("failed to parse owner and repo name from URI %q: %w", urlStr, err)
 	}
 	if strings.HasPrefix(urlStr, "git@") {
-		exp := regexp.MustCompile(`git@(?P<host>.*):(?P<owner>[^/]+)/(?P<name>.+)\.git`)
+		exp := regexp.MustCompile(`git@(?P<host>.+):(?P<owner>[^/]+)/(?P<name>.+)(\.git)?`)
 		m := exp.FindStringSubmatch(urlStr)
 		if m == nil {
 			return "", "", "", fmt.Errorf("path missing expected parts")

diff --git a/pkg/cargo/kilnfile.go b/pkg/cargo/kilnfile.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
+
 	"github.com/google/go-github/v50/github"
 	"golang.org/x/oauth2"
-	"strings"
 
 	"gopkg.in/yaml.v3"
 

diff --git a/pkg/planitest/internal/config.go b/pkg/planitest/internal/config.go
@@ -43,7 +43,6 @@ func MergeAdditionalProductProperties(configFile io.Reader, additionalProperties
 
 	var inputConfig ProductConfiguration
 	err = yaml.Unmarshal(yamlInput, &inputConfig)
-
 	if err != nil {
 		return nil, fmt.Errorf("could not parse config file: %s", err)
 	}

diff --git a/pkg/planitest/internal/om_runner.go b/pkg/planitest/internal/om_runner.go
@@ -89,7 +89,6 @@ func (o OMRunner) ResetAndConfigure(productName string, productVersion string, c
 		"--product-name", productName,
 		"--product-version", productVersion,
 	)
-
 	if err != nil {
 		return fmt.Errorf("Unable to stage product %q, version %q: %s: %s",
 			productName, productVersion, err, errOutput)
@@ -114,7 +113,6 @@ func (o OMRunner) ResetAndConfigure(productName string, productVersion string, c
 		"configure-product",
 		"--config", configFile.Name(),
 	)
-
 	if err != nil {
 		return fmt.Errorf("Unable to configure product %q: %s: %s", productName, err, errOutput)
 	}