From 813d343f6a8e4d68d9438a4fe5b0c78cc1e60f79 Mon Sep 17 00:00:00 2001 From: Johannes Batzill Date: Thu, 18 Aug 2022 15:15:50 -0700 Subject: [PATCH 1/2] Rename module to github.com/harness/scm. Fix web/dist.go --- .gitignore | 2 +- README.md | 22 +++++++------- Taskfile.yml | 12 ++++---- cli/cli.go | 16 +++++----- cli/execution/create.go | 4 +-- cli/execution/delete.go | 2 +- cli/execution/find.go | 2 +- cli/execution/list.go | 4 +-- cli/execution/update.go | 4 +-- cli/login.go | 4 +-- cli/logout.go | 2 +- cli/pipeline/create.go | 4 +-- cli/pipeline/delete.go | 2 +- cli/pipeline/find.go | 2 +- cli/pipeline/list.go | 4 +-- cli/pipeline/update.go | 4 +-- cli/register.go | 4 +-- cli/server/config.go | 2 +- cli/server/server.go | 4 +-- cli/server/system.go | 4 +-- cli/server/wire.go | 15 +++++----- cli/server/wire_gen.go | 12 ++++---- cli/swagger.go | 2 +- cli/token/token.go | 2 +- cli/user/user.go | 2 +- cli/users/create.go | 4 +-- cli/users/delete.go | 2 +- cli/users/find.go | 2 +- cli/users/list.go | 4 +-- cli/users/update.go | 4 +-- cli/util/util.go | 4 +-- client/client.go | 4 +-- client/interface.go | 2 +- contrib/kubernetes/spec.yml | 22 +++++++------- docker/Dockerfile | 4 +-- docker/Dockerfile.alpine | 4 +-- go.mod | 6 +++- go.sum | 3 ++ internal/api/handler/account/login.go | 8 ++--- internal/api/handler/account/register.go | 10 +++---- internal/api/handler/executions/create.go | 8 ++--- internal/api/handler/executions/delete.go | 4 +-- internal/api/handler/executions/find.go | 4 +-- internal/api/handler/executions/list.go | 8 ++--- internal/api/handler/executions/update.go | 8 ++--- internal/api/handler/pipelines/create.go | 8 ++--- internal/api/handler/pipelines/delete.go | 4 +-- internal/api/handler/pipelines/find.go | 6 ++-- internal/api/handler/pipelines/list.go | 8 ++--- internal/api/handler/pipelines/list_test.go | 8 ++--- internal/api/handler/pipelines/update.go | 8 ++--- internal/api/handler/projects/find.go | 4 +-- internal/api/handler/projects/list.go | 4 +-- internal/api/handler/system/version.go | 2 +- internal/api/handler/user/find.go | 6 ++-- internal/api/handler/user/find_test.go | 4 +-- internal/api/handler/user/token.go | 10 +++---- internal/api/handler/user/token_test.go | 4 +-- internal/api/handler/user/update.go | 8 ++--- internal/api/handler/user/update_test.go | 8 ++--- internal/api/handler/users/create.go | 8 ++--- internal/api/handler/users/delete.go | 4 +-- internal/api/handler/users/find.go | 4 +-- internal/api/handler/users/list.go | 8 ++--- internal/api/handler/users/update.go | 8 ++--- internal/api/middleware/access/access.go | 4 +-- internal/api/middleware/token/token.go | 10 +++---- internal/api/openapi/account.go | 4 +-- internal/api/openapi/execution.go | 4 +-- internal/api/openapi/openapi.go | 2 +- internal/api/openapi/pipeline.go | 4 +-- internal/api/openapi/projects.go | 4 +-- internal/api/openapi/user.go | 4 +-- internal/api/openapi/users.go | 4 +-- internal/api/render/platform/render.go | 2 +- internal/api/request/context.go | 2 +- internal/api/request/util.go | 4 +-- internal/router/router.go | 26 ++++++++-------- internal/server/wire.go | 2 +- internal/store/database/execution.go | 4 +-- internal/store/database/execution_sync.go | 6 ++-- internal/store/database/execution_test.go | 4 +-- internal/store/database/pipeline.go | 4 +-- internal/store/database/pipeline_sync.go | 6 ++-- internal/store/database/pipeline_test.go | 4 +-- internal/store/database/store.go | 2 +- internal/store/database/user.go | 6 ++-- internal/store/database/user_sync.go | 6 ++-- internal/store/database/user_test.go | 4 +-- internal/store/database/wire.go | 4 +-- internal/store/memory/config.go | 2 +- internal/store/memory/wire.go | 2 +- internal/store/store.go | 2 +- internal/token/token.go | 2 +- internal/token/token_test.go | 2 +- main.go | 2 +- mocks/mock.go | 4 +-- mocks/mock_client.go | 4 +-- mocks/mock_store.go | 4 +-- types/check/execution.go | 2 +- types/check/pipeline.go | 2 +- types/check/user.go | 2 +- types/check/user_test.go | 2 +- types/types.go | 2 +- web/dist.go | 33 +++++++++++++++++++++ 105 files changed, 305 insertions(+), 264 deletions(-) diff --git a/.gitignore b/.gitignore index a52445cac..883d5e909 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ _research web/node_modules web/dist/files release -my-app +scm-app diff --git a/README.md b/README.md index 0edd3caa8..704487f0d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Build the server and command line tools: ```text $ go generate ./... -$ go build -o release/my-app +$ go build -o release/scm-app ``` # Test @@ -41,7 +41,7 @@ This project supports all operating systems and architectures supported by Go. Start the server at `localhost:3000` ```text -$ release/my-app server +$ release/scm-app server ``` # User Interface @@ -59,53 +59,53 @@ This project includes simple command line tools for interacting with the system. Register a new user: ```text -$ release/my-app register +$ release/scm-app register ``` Login to the application: ```text -$ release/my-app login +$ release/scm-app login ``` Logout from the application: ```text -$ release/my-app logout +$ release/scm-app logout ``` View your account details: ```text -$ release/my-app account +$ release/scm-app account ``` Generate a peronsal access token: ```text -$ release/my-app token +$ release/scm-app token ``` Create a pipeline: ```text -$ release/my-app pipeline create +$ release/scm-app pipeline create ``` List pipelines: ```text -$ release/my-app pipeline ls +$ release/scm-app pipeline ls ``` Debug and output http responses from the server: ```text -$ DEBUG=true release/my-app pipeline ls +$ DEBUG=true release/scm-app pipeline ls ``` View all commands: ```text -$ release/my-app --help +$ release/scm-app --help ``` diff --git a/Taskfile.yml b/Taskfile.yml index e0b3b498f..2dc782bb8 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -26,7 +26,7 @@ tasks: --detach --rm postgres:9-alpine - - cmd: go test -v -cover github.com/bradrydzewski/my-app/internal/store/database + - cmd: go test -v -cover github.com/harness/scm/internal/store/database - cmd: docker kill postgres silent: true @@ -45,16 +45,16 @@ tasks: - rm -rf web/node_modules - rm -rf web/.env.development.local - rm -rf web/swagger.yaml - - rm -rf my-app + - rm -rf scm-app - rm -rf database.sqlite3 - rm -rf .env docker-build: cmds: - - docker build -t bradrydzewski/my-app:linux-amd64 -f docker/Dockerfile . + - docker build -t harness/scm:linux-amd64 -f docker/Dockerfile . docker-build-all: cmds: - - docker build -t bradrydzewski/my-app:linux-amd64 -f docker/Dockerfile . - - docker build -t bradrydzewski/my-app:linux-arm64 -f docker/Dockerfile.linux.arm64 . - - docker build -t bradrydzewski/my-app:linux-arm -f docker/Dockerfile.linux.arm . + - docker build -t harness/scm:linux-amd64 -f docker/Dockerfile . + - docker build -t harness/scm:linux-arm64 -f docker/Dockerfile.linux.arm64 . + - docker build -t harness/scm:linux-arm -f docker/Dockerfile.linux.arm . diff --git a/cli/cli.go b/cli/cli.go index 0f299868f..0d80d5e32 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -8,13 +8,13 @@ import ( "context" "os" - "github.com/bradrydzewski/my-app/cli/execution" - "github.com/bradrydzewski/my-app/cli/pipeline" - "github.com/bradrydzewski/my-app/cli/server" - "github.com/bradrydzewski/my-app/cli/token" - "github.com/bradrydzewski/my-app/cli/user" - "github.com/bradrydzewski/my-app/cli/users" - "github.com/bradrydzewski/my-app/version" + "github.com/harness/scm/cli/execution" + "github.com/harness/scm/cli/pipeline" + "github.com/harness/scm/cli/server" + "github.com/harness/scm/cli/token" + "github.com/harness/scm/cli/user" + "github.com/harness/scm/cli/users" + "github.com/harness/scm/version" "gopkg.in/alecthomas/kingpin.v2" ) @@ -23,7 +23,7 @@ import ( var nocontext = context.Background() // application name -var application = "my-app" +var application = "scm-app" // application description var description = "description goes here" // TODO edit this application description diff --git a/cli/execution/create.go b/cli/execution/create.go index 0c25b66de..3af7d3063 100644 --- a/cli/execution/create.go +++ b/cli/execution/create.go @@ -9,8 +9,8 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/execution/delete.go b/cli/execution/delete.go index b01ac943c..472228afd 100644 --- a/cli/execution/delete.go +++ b/cli/execution/delete.go @@ -5,7 +5,7 @@ package execution import ( - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/execution/find.go b/cli/execution/find.go index 4ac73a911..9db76da1e 100644 --- a/cli/execution/find.go +++ b/cli/execution/find.go @@ -9,7 +9,7 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/execution/list.go b/cli/execution/list.go index bc1821603..bff004342 100644 --- a/cli/execution/list.go +++ b/cli/execution/list.go @@ -9,9 +9,9 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" "github.com/drone/funcmap" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/execution/update.go b/cli/execution/update.go index 654098134..8dcbf7794 100644 --- a/cli/execution/update.go +++ b/cli/execution/update.go @@ -9,9 +9,9 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" "github.com/gotidy/ptr" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/login.go b/cli/login.go index da2eabe41..5e35faf0c 100644 --- a/cli/login.go +++ b/cli/login.go @@ -8,8 +8,8 @@ import ( "encoding/json" "io/ioutil" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/client" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/client" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/logout.go b/cli/logout.go index 6eb9ecfcd..160001985 100644 --- a/cli/logout.go +++ b/cli/logout.go @@ -7,7 +7,7 @@ package cli import ( "os" - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/pipeline/create.go b/cli/pipeline/create.go index 3548973f4..98c0633f4 100644 --- a/cli/pipeline/create.go +++ b/cli/pipeline/create.go @@ -9,8 +9,8 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/pipeline/delete.go b/cli/pipeline/delete.go index 5e3f0e14b..3149d5ae6 100644 --- a/cli/pipeline/delete.go +++ b/cli/pipeline/delete.go @@ -5,7 +5,7 @@ package pipeline import ( - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/pipeline/find.go b/cli/pipeline/find.go index c2bd52b2a..296dc597e 100644 --- a/cli/pipeline/find.go +++ b/cli/pipeline/find.go @@ -9,7 +9,7 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/pipeline/list.go b/cli/pipeline/list.go index 9f56c1f8d..b935b380d 100644 --- a/cli/pipeline/list.go +++ b/cli/pipeline/list.go @@ -9,9 +9,9 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" "github.com/drone/funcmap" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/pipeline/update.go b/cli/pipeline/update.go index 4af9ad120..78161c2cb 100644 --- a/cli/pipeline/update.go +++ b/cli/pipeline/update.go @@ -9,9 +9,9 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" "github.com/gotidy/ptr" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/register.go b/cli/register.go index e48eca178..abc458977 100644 --- a/cli/register.go +++ b/cli/register.go @@ -8,8 +8,8 @@ import ( "encoding/json" "io/ioutil" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/client" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/client" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/server/config.go b/cli/server/config.go index e7541d9c5..58d1cf30c 100644 --- a/cli/server/config.go +++ b/cli/server/config.go @@ -7,7 +7,7 @@ package server import ( "os" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" "github.com/kelseyhightower/envconfig" ) diff --git a/cli/server/server.go b/cli/server/server.go index b9470e596..1267e2dd9 100644 --- a/cli/server/server.go +++ b/cli/server/server.go @@ -8,8 +8,8 @@ import ( "context" "os" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/version" + "github.com/harness/scm/types" + "github.com/harness/scm/version" "github.com/joho/godotenv" "github.com/mattn/go-isatty" diff --git a/cli/server/system.go b/cli/server/system.go index 07de47506..57be75e09 100644 --- a/cli/server/system.go +++ b/cli/server/system.go @@ -5,8 +5,8 @@ package server import ( - "github.com/bradrydzewski/my-app/internal/cron" - "github.com/bradrydzewski/my-app/internal/server" + "github.com/harness/scm/internal/cron" + "github.com/harness/scm/internal/server" ) // system stores high level system sub-routines. diff --git a/cli/server/wire.go b/cli/server/wire.go index 9498362e1..317059c2c 100644 --- a/cli/server/wire.go +++ b/cli/server/wire.go @@ -2,17 +2,18 @@ // Use of this source code is governed by the Polyform Free Trial License // that can be found in the LICENSE.md file for this repository. -//+build wireinject +//go:build wireinject +// +build wireinject package server import ( - "github.com/bradrydzewski/my-app/internal/cron" - "github.com/bradrydzewski/my-app/internal/router" - "github.com/bradrydzewski/my-app/internal/server" - "github.com/bradrydzewski/my-app/internal/store/database" - "github.com/bradrydzewski/my-app/internal/store/memory" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/cron" + "github.com/harness/scm/internal/router" + "github.com/harness/scm/internal/server" + "github.com/harness/scm/internal/store/database" + "github.com/harness/scm/internal/store/memory" + "github.com/harness/scm/types" "github.com/google/wire" ) diff --git a/cli/server/wire_gen.go b/cli/server/wire_gen.go index 6ff70ef9f..3524ce9f7 100644 --- a/cli/server/wire_gen.go +++ b/cli/server/wire_gen.go @@ -7,12 +7,12 @@ package server import ( - "github.com/bradrydzewski/my-app/internal/cron" - "github.com/bradrydzewski/my-app/internal/router" - "github.com/bradrydzewski/my-app/internal/server" - "github.com/bradrydzewski/my-app/internal/store/database" - "github.com/bradrydzewski/my-app/internal/store/memory" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/cron" + "github.com/harness/scm/internal/router" + "github.com/harness/scm/internal/server" + "github.com/harness/scm/internal/store/database" + "github.com/harness/scm/internal/store/memory" + "github.com/harness/scm/types" ) // Injectors from wire.go: diff --git a/cli/swagger.go b/cli/swagger.go index f1f2d4d7d..9d7db3a70 100644 --- a/cli/swagger.go +++ b/cli/swagger.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "os" - "github.com/bradrydzewski/my-app/internal/api/openapi" + "github.com/harness/scm/internal/api/openapi" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/token/token.go b/cli/token/token.go index 0cc721760..334b2ca87 100644 --- a/cli/token/token.go +++ b/cli/token/token.go @@ -8,7 +8,7 @@ import ( "encoding/json" "os" - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/user/user.go b/cli/user/user.go index cee7b323d..aaef4d521 100644 --- a/cli/user/user.go +++ b/cli/user/user.go @@ -9,7 +9,7 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/users/create.go b/cli/users/create.go index f30f3a3bb..453fc9c59 100644 --- a/cli/users/create.go +++ b/cli/users/create.go @@ -9,8 +9,8 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/users/delete.go b/cli/users/delete.go index 2b27e1c2c..c12864c7c 100644 --- a/cli/users/delete.go +++ b/cli/users/delete.go @@ -5,7 +5,7 @@ package users import ( - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/users/find.go b/cli/users/find.go index adb0f672d..2598f0f57 100644 --- a/cli/users/find.go +++ b/cli/users/find.go @@ -9,7 +9,7 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" + "github.com/harness/scm/cli/util" "github.com/drone/funcmap" "gopkg.in/alecthomas/kingpin.v2" diff --git a/cli/users/list.go b/cli/users/list.go index 1c1f2d15d..12b40c01d 100644 --- a/cli/users/list.go +++ b/cli/users/list.go @@ -9,9 +9,9 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" "github.com/drone/funcmap" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "gopkg.in/alecthomas/kingpin.v2" ) diff --git a/cli/users/update.go b/cli/users/update.go index dbde3ba56..6e018f9f2 100644 --- a/cli/users/update.go +++ b/cli/users/update.go @@ -10,8 +10,8 @@ import ( "os" "text/template" - "github.com/bradrydzewski/my-app/cli/util" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/cli/util" + "github.com/harness/scm/types" "github.com/dchest/uniuri" "github.com/drone/funcmap" diff --git a/cli/util/util.go b/cli/util/util.go index ea1ec2776..e2e7cbeb9 100644 --- a/cli/util/util.go +++ b/cli/util/util.go @@ -16,8 +16,8 @@ import ( "syscall" "time" - "github.com/bradrydzewski/my-app/client" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/client" + "github.com/harness/scm/types" "github.com/adrg/xdg" "golang.org/x/crypto/ssh/terminal" diff --git a/client/client.go b/client/client.go index 37d67bc12..d058db8fb 100644 --- a/client/client.go +++ b/client/client.go @@ -13,8 +13,8 @@ import ( "net/http/httputil" "net/url" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/version" + "github.com/harness/scm/types" + "github.com/harness/scm/version" ) // ensure HTTPClient implements Client interface. diff --git a/client/interface.go b/client/interface.go index ec33e4f33..a6f72e1a3 100644 --- a/client/interface.go +++ b/client/interface.go @@ -4,7 +4,7 @@ package client -import "github.com/bradrydzewski/my-app/types" +import "github.com/harness/scm/types" // Client to access the remote APIs. type Client interface { diff --git a/contrib/kubernetes/spec.yml b/contrib/kubernetes/spec.yml index 3968966e0..cabf2f10c 100644 --- a/contrib/kubernetes/spec.yml +++ b/contrib/kubernetes/spec.yml @@ -5,41 +5,41 @@ items: kind: Deployment metadata: labels: - app: my-app - name: my-app + app: scm-app + name: scm-app spec: replicas: 1 selector: matchLabels: - app: my-app + app: scm-app template: metadata: labels: - app: my-app + app: scm-app spec: containers: - - image: gcr.io/XXXXX-XXXXXXX/my-app + - image: gcr.io/XXXXX-XXXXXXX/scm-app imagePullPolicy: Never - name: my-app + name: scm-app - apiVersion: v1 kind: Service metadata: labels: - app: my-app - name: my-app + app: scm-app + name: scm-app spec: ports: - port: 3000 protocol: TCP targetPort: 3000 selector: - app: my-app + app: scm-app - apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: - name: my-app + name: scm-app annotations: nginx.ingress.kubernetes.io/rewrite-target: /$1 kubernetes.io/ingress.class: "nginx" @@ -49,7 +49,7 @@ items: paths: - path: /pm/(.*) backend: - serviceName: my-app + serviceName: scm-app servicePort: 3000 kind: List diff --git a/docker/Dockerfile b/docker/Dockerfile index 3903a2ef7..818bec266 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,5 +8,5 @@ EXPOSE 443 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ ENV GODEBUG netdns=go -ADD release/linux/amd64/my-app /bin/ -ENTRYPOINT ["/bin/my-app", "server"] +ADD release/linux/amd64/scm-app /bin/ +ENTRYPOINT ["/bin/scm-app", "server"] diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 3e56fce68..f66be7754 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -8,5 +8,5 @@ EXPOSE 443 COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ ENV GODEBUG netdns=go -ADD release/linux/amd64/my-app /bin/ -ENTRYPOINT ["/bin/my-app", "server"] \ No newline at end of file +ADD release/linux/amd64/scm-app /bin/ +ENTRYPOINT ["/bin/scm-app", "server"] \ No newline at end of file diff --git a/go.mod b/go.mod index 839d3fabb..e306d65a3 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/bradrydzewski/my-app +module github.com/harness/scm go 1.17 @@ -35,17 +35,21 @@ require ( require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect + github.com/google/subcommands v1.0.1 // indirect github.com/gosimple/unidecode v1.0.1 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/xid v1.3.0 // indirect github.com/swaggest/jsonschema-go v0.3.24 // indirect github.com/swaggest/refl v1.0.1 // indirect github.com/vearutop/statigz v1.1.5 // indirect + golang.org/x/mod v0.4.2 // indirect golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect golang.org/x/text v0.3.6 // indirect + golang.org/x/tools v0.1.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 8d7197ea3..052c1e995 100644 --- a/go.sum +++ b/go.sum @@ -130,6 +130,7 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8= @@ -474,6 +475,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -568,6 +570,7 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/api/handler/account/login.go b/internal/api/handler/account/login.go index 3a6dbb23f..9b0347bd8 100644 --- a/internal/api/handler/account/login.go +++ b/internal/api/handler/account/login.go @@ -8,10 +8,10 @@ import ( "net/http" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/internal/token" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/internal/token" + "github.com/harness/scm/types" "github.com/rs/zerolog/hlog" "golang.org/x/crypto/bcrypt" diff --git a/internal/api/handler/account/register.go b/internal/api/handler/account/register.go index 49886b44d..e096e6ea6 100644 --- a/internal/api/handler/account/register.go +++ b/internal/api/handler/account/register.go @@ -8,11 +8,11 @@ import ( "net/http" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/internal/token" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/check" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/internal/token" + "github.com/harness/scm/types" + "github.com/harness/scm/types/check" "github.com/dchest/uniuri" "github.com/rs/zerolog/hlog" diff --git a/internal/api/handler/executions/create.go b/internal/api/handler/executions/create.go index b5573df4e..fb88bca4e 100644 --- a/internal/api/handler/executions/create.go +++ b/internal/api/handler/executions/create.go @@ -9,13 +9,13 @@ import ( "net/http" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/check" "github.com/go-chi/chi" "github.com/gosimple/slug" "github.com/gotidy/ptr" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" + "github.com/harness/scm/types/check" "github.com/rs/zerolog/hlog" ) diff --git a/internal/api/handler/executions/delete.go b/internal/api/handler/executions/delete.go index 276a9fe27..372c0f299 100644 --- a/internal/api/handler/executions/delete.go +++ b/internal/api/handler/executions/delete.go @@ -7,8 +7,8 @@ package executions import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" "github.com/go-chi/chi" "github.com/rs/zerolog/hlog" diff --git a/internal/api/handler/executions/find.go b/internal/api/handler/executions/find.go index 88a6fada2..019b64493 100644 --- a/internal/api/handler/executions/find.go +++ b/internal/api/handler/executions/find.go @@ -7,8 +7,8 @@ package executions import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" "github.com/go-chi/chi" "github.com/rs/zerolog/hlog" diff --git a/internal/api/handler/executions/list.go b/internal/api/handler/executions/list.go index cac038f75..ffd5f16af 100644 --- a/internal/api/handler/executions/list.go +++ b/internal/api/handler/executions/list.go @@ -7,10 +7,10 @@ package executions import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/go-chi/chi" "github.com/rs/zerolog/hlog" diff --git a/internal/api/handler/executions/update.go b/internal/api/handler/executions/update.go index 7d240a0cd..397cb4f17 100644 --- a/internal/api/handler/executions/update.go +++ b/internal/api/handler/executions/update.go @@ -9,10 +9,10 @@ import ( "net/http" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/check" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" + "github.com/harness/scm/types/check" "github.com/go-chi/chi" "github.com/gotidy/ptr" diff --git a/internal/api/handler/pipelines/create.go b/internal/api/handler/pipelines/create.go index 476a5703f..941ac393c 100644 --- a/internal/api/handler/pipelines/create.go +++ b/internal/api/handler/pipelines/create.go @@ -9,10 +9,10 @@ import ( "net/http" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/check" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" + "github.com/harness/scm/types/check" "github.com/dchest/uniuri" "github.com/gosimple/slug" diff --git a/internal/api/handler/pipelines/delete.go b/internal/api/handler/pipelines/delete.go index c02407494..5fca1d782 100644 --- a/internal/api/handler/pipelines/delete.go +++ b/internal/api/handler/pipelines/delete.go @@ -7,8 +7,8 @@ package pipelines import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" "github.com/go-chi/chi" "github.com/rs/zerolog/hlog" diff --git a/internal/api/handler/pipelines/find.go b/internal/api/handler/pipelines/find.go index 4dab208bc..be9e2c1ff 100644 --- a/internal/api/handler/pipelines/find.go +++ b/internal/api/handler/pipelines/find.go @@ -7,9 +7,9 @@ package pipelines import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/rs/zerolog/hlog" "github.com/go-chi/chi" diff --git a/internal/api/handler/pipelines/list.go b/internal/api/handler/pipelines/list.go index 46bb8b0fa..3caa9c4b6 100644 --- a/internal/api/handler/pipelines/list.go +++ b/internal/api/handler/pipelines/list.go @@ -7,10 +7,10 @@ package pipelines import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/rs/zerolog/log" ) diff --git a/internal/api/handler/pipelines/list_test.go b/internal/api/handler/pipelines/list_test.go index 4d6a34c1b..a94902a42 100644 --- a/internal/api/handler/pipelines/list_test.go +++ b/internal/api/handler/pipelines/list_test.go @@ -10,10 +10,10 @@ import ( "net/http/httptest" "testing" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/mocks" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/mocks" + "github.com/harness/scm/types" "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" diff --git a/internal/api/handler/pipelines/update.go b/internal/api/handler/pipelines/update.go index 090423297..61b85827e 100644 --- a/internal/api/handler/pipelines/update.go +++ b/internal/api/handler/pipelines/update.go @@ -9,10 +9,10 @@ import ( "net/http" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/check" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" + "github.com/harness/scm/types/check" "github.com/go-chi/chi" "github.com/gotidy/ptr" diff --git a/internal/api/handler/projects/find.go b/internal/api/handler/projects/find.go index 16de9e2c9..8b061d9fb 100644 --- a/internal/api/handler/projects/find.go +++ b/internal/api/handler/projects/find.go @@ -7,8 +7,8 @@ package projects import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render/platform" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render/platform" + "github.com/harness/scm/types" ) // standalone version of the product uses a single, diff --git a/internal/api/handler/projects/list.go b/internal/api/handler/projects/list.go index 941c3b244..436ccc8cf 100644 --- a/internal/api/handler/projects/list.go +++ b/internal/api/handler/projects/list.go @@ -7,8 +7,8 @@ package projects import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render/platform" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render/platform" + "github.com/harness/scm/types" ) // standalone version of the product uses a single, diff --git a/internal/api/handler/system/version.go b/internal/api/handler/system/version.go index 3ed55f72e..066d6a348 100644 --- a/internal/api/handler/system/version.go +++ b/internal/api/handler/system/version.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "github.com/bradrydzewski/my-app/version" + "github.com/harness/scm/version" ) // HandleVersion writes the server version number diff --git a/internal/api/handler/user/find.go b/internal/api/handler/user/find.go index 7bf6bbb80..cc54c34c3 100644 --- a/internal/api/handler/user/find.go +++ b/internal/api/handler/user/find.go @@ -7,9 +7,9 @@ package user import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/render/platform" - "github.com/bradrydzewski/my-app/internal/api/request" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/render/platform" + "github.com/harness/scm/internal/api/request" ) // HandleFind returns an http.HandlerFunc that writes json-encoded diff --git a/internal/api/handler/user/find_test.go b/internal/api/handler/user/find_test.go index 27bd1c58c..6a21abe7e 100644 --- a/internal/api/handler/user/find_test.go +++ b/internal/api/handler/user/find_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/types" "github.com/google/go-cmp/cmp" ) diff --git a/internal/api/handler/user/token.go b/internal/api/handler/user/token.go index 5bf7edd82..cbf9de428 100644 --- a/internal/api/handler/user/token.go +++ b/internal/api/handler/user/token.go @@ -7,11 +7,11 @@ package user import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/internal/token" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/internal/token" + "github.com/harness/scm/types" "github.com/rs/zerolog/hlog" ) diff --git a/internal/api/handler/user/token_test.go b/internal/api/handler/user/token_test.go index 94da737f7..4c5f95e80 100644 --- a/internal/api/handler/user/token_test.go +++ b/internal/api/handler/user/token_test.go @@ -9,9 +9,9 @@ import ( "net/http/httptest" "testing" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/types" "github.com/dgrijalva/jwt-go" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/types" "github.com/golang/mock/gomock" ) diff --git a/internal/api/handler/user/update.go b/internal/api/handler/user/update.go index 303b99d40..3087406fe 100644 --- a/internal/api/handler/user/update.go +++ b/internal/api/handler/user/update.go @@ -8,10 +8,10 @@ import ( "encoding/json" "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/rs/zerolog/hlog" "github.com/gotidy/ptr" diff --git a/internal/api/handler/user/update_test.go b/internal/api/handler/user/update_test.go index 723a5c6c1..c184062d2 100644 --- a/internal/api/handler/user/update_test.go +++ b/internal/api/handler/user/update_test.go @@ -10,10 +10,10 @@ import ( "net/http/httptest" "testing" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/mocks" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/mocks" + "github.com/harness/scm/types" "golang.org/x/crypto/bcrypt" "github.com/golang/mock/gomock" diff --git a/internal/api/handler/users/create.go b/internal/api/handler/users/create.go index 61daaafa3..3be557dd2 100644 --- a/internal/api/handler/users/create.go +++ b/internal/api/handler/users/create.go @@ -9,10 +9,10 @@ import ( "net/http" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/check" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" + "github.com/harness/scm/types/check" "github.com/rs/zerolog/hlog" "golang.org/x/crypto/bcrypt" diff --git a/internal/api/handler/users/delete.go b/internal/api/handler/users/delete.go index dd4958aad..9aeedf081 100644 --- a/internal/api/handler/users/delete.go +++ b/internal/api/handler/users/delete.go @@ -7,8 +7,8 @@ package users import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" "github.com/rs/zerolog/hlog" "github.com/go-chi/chi" diff --git a/internal/api/handler/users/find.go b/internal/api/handler/users/find.go index 3c73914b1..4a8c89f18 100644 --- a/internal/api/handler/users/find.go +++ b/internal/api/handler/users/find.go @@ -7,8 +7,8 @@ package users import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" "github.com/rs/zerolog/hlog" "github.com/go-chi/chi" diff --git a/internal/api/handler/users/list.go b/internal/api/handler/users/list.go index 987f58898..197dc50e8 100644 --- a/internal/api/handler/users/list.go +++ b/internal/api/handler/users/list.go @@ -7,10 +7,10 @@ package users import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types/enum" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types/enum" "github.com/rs/zerolog/hlog" ) diff --git a/internal/api/handler/users/update.go b/internal/api/handler/users/update.go index 90c129034..23aa8deed 100644 --- a/internal/api/handler/users/update.go +++ b/internal/api/handler/users/update.go @@ -9,11 +9,11 @@ import ( "net/http" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/check" "github.com/gotidy/ptr" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" + "github.com/harness/scm/types/check" "github.com/rs/zerolog/hlog" "github.com/go-chi/chi" diff --git a/internal/api/middleware/access/access.go b/internal/api/middleware/access/access.go index 51f15c1af..d3027faf1 100644 --- a/internal/api/middleware/access/access.go +++ b/internal/api/middleware/access/access.go @@ -8,8 +8,8 @@ import ( "errors" "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" ) // SystemAdmin returns an http.HandlerFunc middleware that authorizes diff --git a/internal/api/middleware/token/token.go b/internal/api/middleware/token/token.go index c70e4655e..e593a7373 100644 --- a/internal/api/middleware/token/token.go +++ b/internal/api/middleware/token/token.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/internal/api/request" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/internal/token" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/internal/api/request" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/internal/token" + "github.com/harness/scm/types" "github.com/dgrijalva/jwt-go" "github.com/rs/zerolog" diff --git a/internal/api/openapi/account.go b/internal/api/openapi/account.go index 01bef4549..7eca781d7 100644 --- a/internal/api/openapi/account.go +++ b/internal/api/openapi/account.go @@ -7,8 +7,8 @@ package openapi import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/types" "github.com/swaggest/openapi-go/openapi3" ) diff --git a/internal/api/openapi/execution.go b/internal/api/openapi/execution.go index 54d605854..bff20f09f 100644 --- a/internal/api/openapi/execution.go +++ b/internal/api/openapi/execution.go @@ -7,8 +7,8 @@ package openapi import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/types" "github.com/swaggest/openapi-go/openapi3" ) diff --git a/internal/api/openapi/openapi.go b/internal/api/openapi/openapi.go index b234fa511..7c588fab6 100644 --- a/internal/api/openapi/openapi.go +++ b/internal/api/openapi/openapi.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/bradrydzewski/my-app/version" + "github.com/harness/scm/version" "github.com/swaggest/openapi-go/openapi3" ) diff --git a/internal/api/openapi/pipeline.go b/internal/api/openapi/pipeline.go index c352588ff..0f3d0a661 100644 --- a/internal/api/openapi/pipeline.go +++ b/internal/api/openapi/pipeline.go @@ -7,8 +7,8 @@ package openapi import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/types" "github.com/swaggest/openapi-go/openapi3" ) diff --git a/internal/api/openapi/projects.go b/internal/api/openapi/projects.go index 469cb3aa8..47b870a1b 100644 --- a/internal/api/openapi/projects.go +++ b/internal/api/openapi/projects.go @@ -7,8 +7,8 @@ package openapi import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/types" "github.com/swaggest/openapi-go/openapi3" ) diff --git a/internal/api/openapi/user.go b/internal/api/openapi/user.go index 83dfc8d2c..cf4e3cd4a 100644 --- a/internal/api/openapi/user.go +++ b/internal/api/openapi/user.go @@ -7,8 +7,8 @@ package openapi import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/types" "github.com/swaggest/openapi-go/openapi3" ) diff --git a/internal/api/openapi/users.go b/internal/api/openapi/users.go index dec6abdd3..2a12ca3ce 100644 --- a/internal/api/openapi/users.go +++ b/internal/api/openapi/users.go @@ -7,8 +7,8 @@ package openapi import ( "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/api/render" + "github.com/harness/scm/types" "github.com/swaggest/openapi-go/openapi3" ) diff --git a/internal/api/render/platform/render.go b/internal/api/render/platform/render.go index 12be34fa1..8eb666e1a 100644 --- a/internal/api/render/platform/render.go +++ b/internal/api/render/platform/render.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/bradrydzewski/my-app/internal/api/render" + "github.com/harness/scm/internal/api/render" ) // RenderResource is a helper function that renders a single diff --git a/internal/api/request/context.go b/internal/api/request/context.go index fcf4e36d8..75d25b315 100644 --- a/internal/api/request/context.go +++ b/internal/api/request/context.go @@ -10,7 +10,7 @@ package request import ( "context" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" ) type key int diff --git a/internal/api/request/util.go b/internal/api/request/util.go index 6de789d39..e0bdf8e92 100644 --- a/internal/api/request/util.go +++ b/internal/api/request/util.go @@ -8,8 +8,8 @@ import ( "net/http" "strconv" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/enum" + "github.com/harness/scm/types" + "github.com/harness/scm/types/enum" ) // ParsePage extracts the page parameter from the url. diff --git a/internal/router/router.go b/internal/router/router.go index 425266302..c86cb4981 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -10,19 +10,19 @@ import ( "context" "net/http" - "github.com/bradrydzewski/my-app/internal/api/handler/account" - "github.com/bradrydzewski/my-app/internal/api/handler/executions" - "github.com/bradrydzewski/my-app/internal/api/handler/pipelines" - "github.com/bradrydzewski/my-app/internal/api/handler/projects" - "github.com/bradrydzewski/my-app/internal/api/handler/system" - "github.com/bradrydzewski/my-app/internal/api/handler/user" - "github.com/bradrydzewski/my-app/internal/api/handler/users" - "github.com/bradrydzewski/my-app/internal/api/middleware/access" - "github.com/bradrydzewski/my-app/internal/api/middleware/address" - "github.com/bradrydzewski/my-app/internal/api/middleware/token" - "github.com/bradrydzewski/my-app/internal/api/openapi" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/web" + "github.com/harness/scm/internal/api/handler/account" + "github.com/harness/scm/internal/api/handler/executions" + "github.com/harness/scm/internal/api/handler/pipelines" + "github.com/harness/scm/internal/api/handler/projects" + "github.com/harness/scm/internal/api/handler/system" + "github.com/harness/scm/internal/api/handler/user" + "github.com/harness/scm/internal/api/handler/users" + "github.com/harness/scm/internal/api/middleware/access" + "github.com/harness/scm/internal/api/middleware/address" + "github.com/harness/scm/internal/api/middleware/token" + "github.com/harness/scm/internal/api/openapi" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/web" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" diff --git a/internal/server/wire.go b/internal/server/wire.go index a028343dc..5f7bd6a7b 100644 --- a/internal/server/wire.go +++ b/internal/server/wire.go @@ -7,7 +7,7 @@ package server import ( "net/http" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" "github.com/google/wire" ) diff --git a/internal/store/database/execution.go b/internal/store/database/execution.go index 1ec448de5..c3ff47d46 100644 --- a/internal/store/database/execution.go +++ b/internal/store/database/execution.go @@ -7,8 +7,8 @@ package database import ( "context" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/jmoiron/sqlx" ) diff --git a/internal/store/database/execution_sync.go b/internal/store/database/execution_sync.go index 4677c2cef..5584eed70 100644 --- a/internal/store/database/execution_sync.go +++ b/internal/store/database/execution_sync.go @@ -7,9 +7,9 @@ package database import ( "context" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/internal/store/database/mutex" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/internal/store/database/mutex" + "github.com/harness/scm/types" ) var _ store.ExecutionStore = (*ExecutionStoreSync)(nil) diff --git a/internal/store/database/execution_test.go b/internal/store/database/execution_test.go index db4a62dff..d97181faf 100644 --- a/internal/store/database/execution_test.go +++ b/internal/store/database/execution_test.go @@ -8,10 +8,10 @@ import ( "database/sql" "testing" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/jmoiron/sqlx" ) diff --git a/internal/store/database/pipeline.go b/internal/store/database/pipeline.go index 1cb10137b..76379de85 100644 --- a/internal/store/database/pipeline.go +++ b/internal/store/database/pipeline.go @@ -7,8 +7,8 @@ package database import ( "context" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/jmoiron/sqlx" ) diff --git a/internal/store/database/pipeline_sync.go b/internal/store/database/pipeline_sync.go index 68d975375..70aff0b8d 100644 --- a/internal/store/database/pipeline_sync.go +++ b/internal/store/database/pipeline_sync.go @@ -7,9 +7,9 @@ package database import ( "context" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/internal/store/database/mutex" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/internal/store/database/mutex" + "github.com/harness/scm/types" ) var _ store.PipelineStore = (*PipelineStoreSync)(nil) diff --git a/internal/store/database/pipeline_test.go b/internal/store/database/pipeline_test.go index 9f0abc04d..19fda2070 100644 --- a/internal/store/database/pipeline_test.go +++ b/internal/store/database/pipeline_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" diff --git a/internal/store/database/store.go b/internal/store/database/store.go index 1067cabbf..d45574e3b 100644 --- a/internal/store/database/store.go +++ b/internal/store/database/store.go @@ -10,7 +10,7 @@ import ( "database/sql" "time" - "github.com/bradrydzewski/my-app/internal/store/database/migrate" + "github.com/harness/scm/internal/store/database/migrate" "github.com/Masterminds/squirrel" "github.com/jmoiron/sqlx" diff --git a/internal/store/database/user.go b/internal/store/database/user.go index 2c8ec131d..cae448ba7 100644 --- a/internal/store/database/user.go +++ b/internal/store/database/user.go @@ -8,9 +8,9 @@ import ( "context" "strconv" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" - "github.com/bradrydzewski/my-app/types/enum" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" + "github.com/harness/scm/types/enum" "github.com/jmoiron/sqlx" ) diff --git a/internal/store/database/user_sync.go b/internal/store/database/user_sync.go index 236957b51..4e5293627 100644 --- a/internal/store/database/user_sync.go +++ b/internal/store/database/user_sync.go @@ -7,9 +7,9 @@ package database import ( "context" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/internal/store/database/mutex" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/internal/store/database/mutex" + "github.com/harness/scm/types" ) var _ store.UserStore = (*UserStoreSync)(nil) diff --git a/internal/store/database/user_test.go b/internal/store/database/user_test.go index b7a621888..b395e41ad 100644 --- a/internal/store/database/user_test.go +++ b/internal/store/database/user_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" diff --git a/internal/store/database/wire.go b/internal/store/database/wire.go index 4fc7ea8f5..38f9f151a 100644 --- a/internal/store/database/wire.go +++ b/internal/store/database/wire.go @@ -5,8 +5,8 @@ package database import ( - "github.com/bradrydzewski/my-app/internal/store" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/internal/store" + "github.com/harness/scm/types" "github.com/google/wire" "github.com/jmoiron/sqlx" diff --git a/internal/store/memory/config.go b/internal/store/memory/config.go index 34d0cfaa7..af08d0d53 100644 --- a/internal/store/memory/config.go +++ b/internal/store/memory/config.go @@ -8,7 +8,7 @@ package memory import ( "context" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" ) // New returns a new system configuration store. diff --git a/internal/store/memory/wire.go b/internal/store/memory/wire.go index 01061a9a7..1a1fd508c 100644 --- a/internal/store/memory/wire.go +++ b/internal/store/memory/wire.go @@ -5,8 +5,8 @@ package memory import ( - "github.com/bradrydzewski/my-app/internal/store" "github.com/google/wire" + "github.com/harness/scm/internal/store" ) // WireSet provides a wire set for this package diff --git a/internal/store/store.go b/internal/store/store.go index 73b70d176..d39f9f035 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -8,7 +8,7 @@ package store import ( "context" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" ) type ( diff --git a/internal/token/token.go b/internal/token/token.go index 1dd5e57da..43b6c26f8 100644 --- a/internal/token/token.go +++ b/internal/token/token.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" "github.com/dgrijalva/jwt-go" ) diff --git a/internal/token/token_test.go b/internal/token/token_test.go index e6e01c9c2..f8f5125c3 100644 --- a/internal/token/token_test.go +++ b/internal/token/token_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" "github.com/dgrijalva/jwt-go" ) diff --git a/main.go b/main.go index 1091d375a..e6d79cd29 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ package main import ( - "github.com/bradrydzewski/my-app/cli" + "github.com/harness/scm/cli" _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" diff --git a/mocks/mock.go b/mocks/mock.go index e3688d561..ab7fad683 100644 --- a/mocks/mock.go +++ b/mocks/mock.go @@ -5,5 +5,5 @@ // Package mocks provides mock interfaces. package mocks -//go:generate mockgen -package=mocks -destination=mock_store.go github.com/bradrydzewski/my-app/internal/store ExecutionStore,PipelineStore,SystemStore,UserStore -//go:generate mockgen -package=mocks -destination=mock_client.go github.com/bradrydzewski/my-app/client Client +//go:generate mockgen -package=mocks -destination=mock_store.go github.com/harness/scm/internal/store ExecutionStore,PipelineStore,SystemStore,UserStore +//go:generate mockgen -package=mocks -destination=mock_client.go github.com/harness/scm/client Client diff --git a/mocks/mock_client.go b/mocks/mock_client.go index 1586c16c9..d48c62936 100644 --- a/mocks/mock_client.go +++ b/mocks/mock_client.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/bradrydzewski/my-app/client (interfaces: Client) +// Source: github.com/harness/scm/client (interfaces: Client) // Package mocks is a generated GoMock package. package mocks @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - types "github.com/bradrydzewski/my-app/types" + types "github.com/harness/scm/types" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/mock_store.go b/mocks/mock_store.go index 0706190a0..5e02a1969 100644 --- a/mocks/mock_store.go +++ b/mocks/mock_store.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/bradrydzewski/my-app/internal/store (interfaces: ExecutionStore,PipelineStore,SystemStore,UserStore) +// Source: github.com/harness/scm/internal/store (interfaces: ExecutionStore,PipelineStore,SystemStore,UserStore) // Package mocks is a generated GoMock package. package mocks @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - types "github.com/bradrydzewski/my-app/types" + types "github.com/harness/scm/types" gomock "github.com/golang/mock/gomock" ) diff --git a/types/check/execution.go b/types/check/execution.go index fde2f4a48..7d585e525 100644 --- a/types/check/execution.go +++ b/types/check/execution.go @@ -7,7 +7,7 @@ package check import ( "errors" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" "github.com/gosimple/slug" ) diff --git a/types/check/pipeline.go b/types/check/pipeline.go index bda312305..758da430f 100644 --- a/types/check/pipeline.go +++ b/types/check/pipeline.go @@ -7,7 +7,7 @@ package check import ( "errors" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" "github.com/gosimple/slug" ) diff --git a/types/check/user.go b/types/check/user.go index cd1a949b3..4783d5977 100644 --- a/types/check/user.go +++ b/types/check/user.go @@ -7,7 +7,7 @@ package check import ( "errors" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" ) var ( diff --git a/types/check/user_test.go b/types/check/user_test.go index 63b892c1a..67d6b59ef 100644 --- a/types/check/user_test.go +++ b/types/check/user_test.go @@ -7,7 +7,7 @@ package check import ( "testing" - "github.com/bradrydzewski/my-app/types" + "github.com/harness/scm/types" ) func TestUser(t *testing.T) { diff --git a/types/types.go b/types/types.go index f1a3dca0a..aa9bea503 100644 --- a/types/types.go +++ b/types/types.go @@ -8,7 +8,7 @@ package types import ( "time" - "github.com/bradrydzewski/my-app/types/enum" + "github.com/harness/scm/types/enum" ) type ( diff --git a/web/dist.go b/web/dist.go index 68b85db6b..3e3f9e6ab 100644 --- a/web/dist.go +++ b/web/dist.go @@ -10,7 +10,40 @@ package web import ( "embed" + "io/fs" + "net/http" + "path/filepath" ) //go:embed dist/* var UI embed.FS + +// Handler returns an http.HandlerFunc that servers the +// static content from the embedded file system. +func Handler() http.HandlerFunc { + // Load the files subdirectory + fs, err := fs.Sub(UI, "dist") + if err != nil { + panic(err) + } + // Create an http.FileServer to serve the + // contents of the files subdiretory. + handler := http.FileServer(http.FS(fs)) + + // Create an http.HandlerFunc that wraps the + // http.FileServer to always load the index.html + // file if a directory path is being requested. + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // because this is a single page application, + // we need to always load the index.html file + // in the root of the project, unless the path + // points to a file with an extension (css, js, etc) + if filepath.Ext(r.URL.Path) == "" { + // HACK: alter the path to point to the + // root of the project. + r.URL.Path = "/" + } + // and finally server the file. + handler.ServeHTTP(w, r) + }) +} From baec2451ada821e6fc25c58eb0e4aae624f6ffd9 Mon Sep 17 00:00:00 2001 From: Johannes Batzill Date: Thu, 18 Aug 2022 15:22:53 -0700 Subject: [PATCH 2/2] fix import ordering for mock classes --- mocks/mock_client.go | 2 +- mocks/mock_store.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mocks/mock_client.go b/mocks/mock_client.go index d48c62936..259ce1427 100644 --- a/mocks/mock_client.go +++ b/mocks/mock_client.go @@ -7,8 +7,8 @@ package mocks import ( reflect "reflect" - types "github.com/harness/scm/types" gomock "github.com/golang/mock/gomock" + types "github.com/harness/scm/types" ) // MockClient is a mock of Client interface. diff --git a/mocks/mock_store.go b/mocks/mock_store.go index 5e02a1969..459322ac6 100644 --- a/mocks/mock_store.go +++ b/mocks/mock_store.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - types "github.com/harness/scm/types" gomock "github.com/golang/mock/gomock" + types "github.com/harness/scm/types" ) // MockExecutionStore is a mock of ExecutionStore interface.