Merge pull request #6 from Cray-HPE/feature/github-phase-3

Feature/GitHub phase 3
Cray-HPE · Jul 26, 2021 · 174bb12 · 174bb12
2 parents 83d648b + 2baa437
commit 174bb12
Show file tree

Hide file tree

Showing 218 changed files with 17,867 additions and 535 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.30.8
+1.30.9
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.30.9] - 2021-07-26
+
+### Added
+
+- github transition phase 3. Remove stash references.
+
 ## [1.30.8] - 2021-07-22
 
 ### Added

diff --git a/Dockerfile.coverage b/Dockerfile.coverage
@@ -24,6 +24,6 @@ FROM cray/smd-base
 
 # Run test coverage...
 RUN set -ex && \
-    go test -cover -v stash.us.cray.com/HMS/hms-smd/cmd/smd && \
-    go test -cover -v stash.us.cray.com/HMS/hms-smd/internal/./... && \
-    go test -cover -v stash.us.cray.com/HMS/hms-smd/pkg/./...
+    go test -cover -v github.com/Cray-HPE/hms-smd/cmd/smd && \
+    go test -cover -v github.com/Cray-HPE/hms-smd/internal/./... && \
+    go test -cover -v github.com/Cray-HPE/hms-smd/pkg/./...
diff --git a/Dockerfile.smd b/Dockerfile.smd
@@ -35,19 +35,19 @@ FROM build-base AS base
 RUN go env -w GO111MODULE=auto
 
 # Copy all the necessary files to the image.
-COPY cmd $GOPATH/src/stash.us.cray.com/HMS/hms-smd/cmd
-COPY internal $GOPATH/src/stash.us.cray.com/HMS/hms-smd/internal
-COPY pkg $GOPATH/src/stash.us.cray.com/HMS/hms-smd/pkg
-COPY vendor $GOPATH/src/stash.us.cray.com/HMS/hms-smd/vendor
+COPY cmd $GOPATH/src/github.com/Cray-HPE/hms-smd/cmd
+COPY internal $GOPATH/src/github.com/Cray-HPE/hms-smd/internal
+COPY pkg $GOPATH/src/github.com/Cray-HPE/hms-smd/pkg
+COPY vendor $GOPATH/src/github.com/Cray-HPE/hms-smd/vendor
 
 ### Build Stage ###
 FROM base AS builder
 
 # Base image contains everything needed for Go building, just build.
 RUN set -ex \
-    && go build -v -i stash.us.cray.com/HMS/hms-smd/cmd/smd \
-    && go build -v -i stash.us.cray.com/HMS/hms-smd/cmd/smd-loader \
-    && go build -v -i stash.us.cray.com/HMS/hms-smd/cmd/smd-init
+    && go build -v -i github.com/Cray-HPE/hms-smd/cmd/smd \
+    && go build -v -i github.com/Cray-HPE/hms-smd/cmd/smd-loader \
+    && go build -v -i github.com/Cray-HPE/hms-smd/cmd/smd-init
 
 
 ### Final Stage ###

diff --git a/Dockerfile.testing b/Dockerfile.testing
@@ -24,6 +24,6 @@ FROM cray/smd-base
 
 # Run unit tests...
 RUN set -ex && \
-    go test -v stash.us.cray.com/HMS/hms-smd/cmd/smd && \
-    go test -v stash.us.cray.com/HMS/hms-smd/internal/./... && \
-    go test -v stash.us.cray.com/HMS/hms-smd/pkg/./...
+    go test -v github.com/Cray-HPE/hms-smd/cmd/smd && \
+    go test -v github.com/Cray-HPE/hms-smd/internal/./... && \
+    go test -v github.com/Cray-HPE/hms-smd/pkg/./...
diff --git a/README.md b/README.md
@@ -211,11 +211,11 @@ http://web.us.cray.com/~ekoen/cray-portal/public
 
 Latest detailed API usage examples:
 
-https://stash.us.cray.com/projects/HMS/repos/hms-smd/browse/docs/examples.adoc  (current)
+https://github.com/Cray-HPE/hms-smd/blob/master/docs/examples.adoc  (current)
 
 Latest swagger.yaml (if you would prefer to use the OpenAPI viewer of your choice):
 
-https://stash.us.cray.com/projects/HMS/repos/hms-smd/browse/api/swagger.yaml (current)
+https://github.com/Cray-HPE/hms-smd/blob/master/api/swagger_v2.yaml (current)
 
 
 

diff --git a/cmd/smd-init/smd-init.go b/cmd/smd-init/smd-init.go
@@ -34,7 +34,7 @@ import (
 	"github.com/golang-migrate/migrate/v4/database/postgres"
 	_ "github.com/golang-migrate/migrate/v4/source/file"
 	_ "github.com/lib/pq"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
 )
 
 const APP_VERSION = "1"

diff --git a/cmd/smd-loader/smd-loader.go b/cmd/smd-loader/smd-loader.go
@@ -30,8 +30,8 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
-	"stash.us.cray.com/HMS/hms-base"
-	hmshttp "stash.us.cray.com/HMS/hms-go-http-lib"
+	"github.com/Cray-HPE/hms-base"
+	hmshttp "github.com/Cray-HPE/hms-go-http-lib"
 	"syscall"
 	"time"
 )

diff --git a/cmd/smd/components.go b/cmd/smd/components.go
@@ -27,9 +27,9 @@ import (
 	"fmt"
 	"strconv"
 
-	base "stash.us.cray.com/HMS/hms-base"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
-	rf "stash.us.cray.com/HMS/hms-smd/pkg/redfish"
+	base "github.com/Cray-HPE/hms-base"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
+	rf "github.com/Cray-HPE/hms-smd/pkg/redfish"
 )
 
 ////////////////////////////////////////////////////////////////////////////

diff --git a/cmd/smd/discover.go b/cmd/smd/discover.go
@@ -28,10 +28,10 @@ import (
 	"strings"
 	"sync"
 
-	base "stash.us.cray.com/HMS/hms-base"
-	compcreds "stash.us.cray.com/HMS/hms-compcredentials"
-	rf "stash.us.cray.com/HMS/hms-smd/pkg/redfish"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	base "github.com/Cray-HPE/hms-base"
+	compcreds "github.com/Cray-HPE/hms-compcredentials"
+	rf "github.com/Cray-HPE/hms-smd/pkg/redfish"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 )
 
 // When we discover a Redfish Endpoint, the data retrieved is processed

diff --git a/cmd/smd/hmsdsmock_test.go b/cmd/smd/hmsdsmock_test.go
@@ -25,9 +25,9 @@ package main
 import (
 	"log"
 
-	base "stash.us.cray.com/HMS/hms-base"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	base "github.com/Cray-HPE/hms-base"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 )
 
 type TestResults struct {

diff --git a/cmd/smd/job-types.go b/cmd/smd/job-types.go
@@ -35,8 +35,8 @@ import (
 	"sync"
 	"time"
 
-	base "stash.us.cray.com/HMS/hms-base"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	base "github.com/Cray-HPE/hms-base"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 )
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/cmd/smd/msgbus.go b/cmd/smd/msgbus.go
@@ -23,8 +23,8 @@
 package main
 
 import (
-	base "stash.us.cray.com/HMS/hms-base"
-	msgbus "stash.us.cray.com/HMS/hms-msgbus"
+	base "github.com/Cray-HPE/hms-base"
+	msgbus "github.com/Cray-HPE/hms-msgbus"
 	"strconv"
 	"strings"
 )

diff --git a/cmd/smd/msgbus_test.go b/cmd/smd/msgbus_test.go
@@ -23,7 +23,7 @@
 package main
 
 import (
-	msgbus "stash.us.cray.com/HMS/hms-msgbus"
+	msgbus "github.com/Cray-HPE/hms-msgbus"
 	"testing"
 )
 

diff --git a/cmd/smd/response.go b/cmd/smd/response.go
@@ -27,8 +27,8 @@ import (
 	"fmt"
 	"net/http"
 
-	base "stash.us.cray.com/HMS/hms-base"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	base "github.com/Cray-HPE/hms-base"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 )
 
 type Response struct {

diff --git a/cmd/smd/rfevent.go b/cmd/smd/rfevent.go
@@ -28,10 +28,10 @@ import (
 	"strings"
 	"sync"
 
-	base "stash.us.cray.com/HMS/hms-base"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
-	rf "stash.us.cray.com/HMS/hms-smd/pkg/redfish"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	base "github.com/Cray-HPE/hms-base"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
+	rf "github.com/Cray-HPE/hms-smd/pkg/redfish"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 )
 
 var em = base.NewHMSError("sm.msgbus", "internal error")

diff --git a/cmd/smd/rfevent_test.go b/cmd/smd/rfevent_test.go
@@ -27,12 +27,12 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	compcreds "stash.us.cray.com/HMS/hms-compcredentials"
-	sstorage "stash.us.cray.com/HMS/hms-securestorage"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
-	rf "stash.us.cray.com/HMS/hms-smd/pkg/redfish"
-	st "stash.us.cray.com/HMS/hms-smd/pkg/sharedtest"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	compcreds "github.com/Cray-HPE/hms-compcredentials"
+	sstorage "github.com/Cray-HPE/hms-securestorage"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
+	rf "github.com/Cray-HPE/hms-smd/pkg/redfish"
+	st "github.com/Cray-HPE/hms-smd/pkg/sharedtest"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 	"testing"
 )
 

diff --git a/cmd/smd/smd-api.go b/cmd/smd/smd-api.go
@@ -30,11 +30,11 @@ import (
 	"strconv"
 	"strings"
 
-	base "stash.us.cray.com/HMS/hms-base"
-	compcreds "stash.us.cray.com/HMS/hms-compcredentials"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
-	rf "stash.us.cray.com/HMS/hms-smd/pkg/redfish"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	base "github.com/Cray-HPE/hms-base"
+	compcreds "github.com/Cray-HPE/hms-compcredentials"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
+	rf "github.com/Cray-HPE/hms-smd/pkg/redfish"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 
 	"github.com/gorilla/mux"
 )

diff --git a/cmd/smd/smd-api_test.go b/cmd/smd/smd-api_test.go
@@ -35,12 +35,12 @@ import (
 	"strings"
 	"testing"
 
-	base "stash.us.cray.com/HMS/hms-base"
-	compcreds "stash.us.cray.com/HMS/hms-compcredentials"
-	sstorage "stash.us.cray.com/HMS/hms-securestorage"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
-	stest "stash.us.cray.com/HMS/hms-smd/pkg/sharedtest"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	base "github.com/Cray-HPE/hms-base"
+	compcreds "github.com/Cray-HPE/hms-compcredentials"
+	sstorage "github.com/Cray-HPE/hms-securestorage"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
+	stest "github.com/Cray-HPE/hms-smd/pkg/sharedtest"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 
 	"github.com/gorilla/mux"
 )

diff --git a/cmd/smd/smd.go b/cmd/smd/smd.go
@@ -34,16 +34,16 @@ import (
 	"net/http"
 	"os"
 	"runtime"
-	base "stash.us.cray.com/HMS/hms-base"
-	compcreds "stash.us.cray.com/HMS/hms-compcredentials"
-	msgbus "stash.us.cray.com/HMS/hms-msgbus"
-	sstorage "stash.us.cray.com/HMS/hms-securestorage"
-	"stash.us.cray.com/HMS/hms-smd/internal/hbtdapi"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
-	"stash.us.cray.com/HMS/hms-smd/internal/slsapi"
-	"stash.us.cray.com/HMS/hms-smd/pkg/redfish"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
-	"stash.us.cray.com/HMS/hms-certs/pkg/hms_certs"
+	base "github.com/Cray-HPE/hms-base"
+	compcreds "github.com/Cray-HPE/hms-compcredentials"
+	msgbus "github.com/Cray-HPE/hms-msgbus"
+	sstorage "github.com/Cray-HPE/hms-securestorage"
+	"github.com/Cray-HPE/hms-smd/internal/hbtdapi"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
+	"github.com/Cray-HPE/hms-smd/internal/slsapi"
+	"github.com/Cray-HPE/hms-smd/pkg/redfish"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
+	"github.com/Cray-HPE/hms-certs/pkg/hms_certs"
 	"strconv"
 	"strings"
 	"sync"

diff --git a/cmd/smd/state-change.go b/cmd/smd/state-change.go
@@ -24,10 +24,10 @@ package main
 
 import (
 	"encoding/json"
-	base "stash.us.cray.com/HMS/hms-base"
-	"stash.us.cray.com/HMS/hms-smd/internal/hmsds"
-	"stash.us.cray.com/HMS/hms-smd/pkg/redfish"
-	"stash.us.cray.com/HMS/hms-smd/pkg/sm"
+	base "github.com/Cray-HPE/hms-base"
+	"github.com/Cray-HPE/hms-smd/internal/hmsds"
+	"github.com/Cray-HPE/hms-smd/pkg/redfish"
+	"github.com/Cray-HPE/hms-smd/pkg/sm"
 	"strconv"
 	"strings"
 	"time"

diff --git a/go.mod b/go.mod
@@ -1,8 +1,14 @@
-module stash.us.cray.com/HMS/hms-smd
+module github.com/Cray-HPE/hms-smd
 
 go 1.16
 
 require (
+	github.com/Cray-HPE/hms-base v1.15.0
+	github.com/Cray-HPE/hms-certs v1.3.2
+	github.com/Cray-HPE/hms-compcredentials v1.11.2
+	github.com/Cray-HPE/hms-go-http-lib v1.5.3
+	github.com/Cray-HPE/hms-msgbus v1.10.2
+	github.com/Cray-HPE/hms-securestorage v1.12.2
 	github.com/DATA-DOG/go-sqlmock v1.3.3
 	github.com/Masterminds/squirrel v1.4.0
 	github.com/frankban/quicktest v1.7.3 // indirect
@@ -12,12 +18,12 @@ require (
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/mux v1.7.4
 	github.com/hashicorp/go-hclog v0.14.1 // indirect
-	github.com/hashicorp/go-retryablehttp v0.6.7
+	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/lib/pq v1.3.0
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect
 	github.com/pierrec/lz4 v2.4.1+incompatible // indirect
-	github.com/sirupsen/logrus v1.6.0
+	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.5.1 // indirect
 	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
 	golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
@@ -28,10 +34,4 @@ require (
 	google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70 // indirect
 	google.golang.org/grpc v1.29.1 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
-	stash.us.cray.com/HMS/hms-base v1.13.0
-	stash.us.cray.com/HMS/hms-certs v1.3.0
-	stash.us.cray.com/HMS/hms-compcredentials v1.11.0
-	stash.us.cray.com/HMS/hms-go-http-lib v1.5.0
-	stash.us.cray.com/HMS/hms-msgbus v1.10.0
-	stash.us.cray.com/HMS/hms-securestorage v1.12.0
 )