diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39f90f2ce..86d003c33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,13 +28,13 @@ jobs: mkdir -p $(go env GOPATH)/src/github.com/sodafoundation/multi-cloud sudo ln -s $(pwd) $(go env GOPATH)/src/github.com/sodafoundation/multi-cloud - - name: Create the Folder structure and symlink to opensds (TODO:-Fix vendor module from opensds to sodafoundation) + - name: Create the Folder structure and symlink to soda (TODO:-Fix vendor module from soda to sodafoundation) run: | echo "Check current dir: \n" pwd echo "GOPATH: $(go env GOPATH)" - sudo mkdir -p $(go env GOPATH)/src/github.com/opensds - sudo ln -s $(go env GOPATH)/src/github.com/sodafoundation $(go env GOPATH)/src/github.com/opensds + sudo mkdir -p $(go env GOPATH)/src/github.com/soda + sudo ln -s $(go env GOPATH)/src/github.com/sodafoundation $(go env GOPATH)/src/github.com/soda - name: Install Pre-requisites run: | diff --git a/K8s/soda-secret.yaml b/K8s/soda-secret.yaml index 305ccb2e0..7f0a5c46c 100644 --- a/K8s/soda-secret.yaml +++ b/K8s/soda-secret.yaml @@ -20,8 +20,8 @@ metadata: name: soda-secret type: Opaque stringData: - OS_USERNAME: opensds - OS_PASSWORD: opensds@123 + OS_USERNAME: soda + OS_PASSWORD: soda@123 MONGO_USER: admin MONGO_PASSWORD: mongo \ No newline at end of file diff --git a/Makefile b/Makefile index 8563ccd0c..c7aab8d32 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,28 +30,28 @@ prebuild: mkdir -p $(BUILD_DIR) api: prebuild - CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/api github.com/opensds/multi-cloud/api/cmd + CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/api github.com/soda/multi-cloud/api/cmd aksk: prebuild - CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/aksk github.com/opensds/multi-cloud/aksk/cmd + CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/aksk github.com/soda/multi-cloud/aksk/cmd backend: prebuild - CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/backend github.com/opensds/multi-cloud/backend/cmd + CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/backend github.com/soda/multi-cloud/backend/cmd s3: prebuild - CGO_ENABLED=1 GOOS=linux go build -ldflags '-w -s -extldflags "-dynamic"' -o $(BUILD_DIR)/s3 github.com/opensds/multi-cloud/s3/cmd + CGO_ENABLED=1 GOOS=linux go build -ldflags '-w -s -extldflags "-dynamic"' -o $(BUILD_DIR)/s3 github.com/soda/multi-cloud/s3/cmd dataflow: prebuild - CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/dataflow github.com/opensds/multi-cloud/dataflow/cmd + CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/dataflow github.com/soda/multi-cloud/dataflow/cmd datamover: prebuild - CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/datamover github.com/opensds/multi-cloud/datamover/cmd + CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/datamover github.com/soda/multi-cloud/datamover/cmd file: prebuild - CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/file github.com/opensds/multi-cloud/file/cmd + CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/file github.com/soda/multi-cloud/file/cmd block: prebuild - CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/block github.com/opensds/multi-cloud/block/cmd + CGO_ENABLED=0 GOOS=linux go build -ldflags '-w -s -extldflags "-static"' -o $(BUILD_DIR)/block github.com/soda/multi-cloud/block/cmd docker: build diff --git a/aksk/cmd/main.go b/aksk/cmd/main.go index 98b0c69e4..371068199 100644 --- a/aksk/cmd/main.go +++ b/aksk/cmd/main.go @@ -20,11 +20,11 @@ import ( "github.com/micro/go-micro/v2" log "github.com/sirupsen/logrus" - "github.com/opensds/multi-cloud/aksk/pkg/iam" - handler "github.com/opensds/multi-cloud/aksk/pkg/service" - "github.com/opensds/multi-cloud/aksk/pkg/utils/config" - pb "github.com/opensds/multi-cloud/aksk/proto" - "github.com/opensds/multi-cloud/api/pkg/utils/obs" + "github.com/soda/multi-cloud/aksk/pkg/iam" + handler "github.com/soda/multi-cloud/aksk/pkg/service" + "github.com/soda/multi-cloud/aksk/pkg/utils/config" + pb "github.com/soda/multi-cloud/aksk/proto" + "github.com/soda/multi-cloud/api/pkg/utils/obs" ) func main() { diff --git a/aksk/pkg/iam/driver/keystone/keystone.go b/aksk/pkg/iam/driver/keystone/keystone.go index 4c2c0d58a..d91cceae1 100644 --- a/aksk/pkg/iam/driver/keystone/keystone.go +++ b/aksk/pkg/iam/driver/keystone/keystone.go @@ -27,9 +27,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/opensds/multi-cloud/aksk/pkg/model" - "github.com/opensds/multi-cloud/aksk/pkg/utils" - pb "github.com/opensds/multi-cloud/aksk/proto" + "github.com/soda/multi-cloud/aksk/pkg/model" + "github.com/soda/multi-cloud/aksk/pkg/utils" + pb "github.com/soda/multi-cloud/aksk/proto" ) const ( diff --git a/aksk/pkg/iam/iam.go b/aksk/pkg/iam/iam.go index cde86c691..39165b913 100644 --- a/aksk/pkg/iam/iam.go +++ b/aksk/pkg/iam/iam.go @@ -19,10 +19,10 @@ import ( log "github.com/sirupsen/logrus" - "github.com/opensds/multi-cloud/aksk/pkg/iam/driver/keystone" - "github.com/opensds/multi-cloud/aksk/pkg/model" - "github.com/opensds/multi-cloud/aksk/pkg/utils/config" - pb "github.com/opensds/multi-cloud/aksk/proto" + "github.com/soda/multi-cloud/aksk/pkg/iam/driver/keystone" + "github.com/soda/multi-cloud/aksk/pkg/model" + "github.com/soda/multi-cloud/aksk/pkg/utils/config" + pb "github.com/soda/multi-cloud/aksk/proto" ) type IAMAuthenticator interface { diff --git a/aksk/pkg/service/service.go b/aksk/pkg/service/service.go index d424fe84d..4520aa7c4 100644 --- a/aksk/pkg/service/service.go +++ b/aksk/pkg/service/service.go @@ -19,9 +19,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/opensds/multi-cloud/aksk/pkg/iam" - "github.com/opensds/multi-cloud/aksk/pkg/model" - pb "github.com/opensds/multi-cloud/aksk/proto" + "github.com/soda/multi-cloud/aksk/pkg/iam" + "github.com/soda/multi-cloud/aksk/pkg/model" + pb "github.com/soda/multi-cloud/aksk/proto" ) type akskService struct { diff --git a/api/Autobuildfile b/api/Autobuildfile index 1c0171e4c..cbd316f9e 100644 --- a/api/Autobuildfile +++ b/api/Autobuildfile @@ -1,6 +1,6 @@ FROM alpine:latest -RUN mkdir -p /etc/opensds -COPY api/pkg/examples/policy.json /etc/opensds/ +RUN mkdir -p /etc/soda +COPY api/pkg/examples/policy.json /etc/soda/ COPY api/api /api ENTRYPOINT ["/api"] diff --git a/api/cmd/main.go b/api/cmd/main.go index ff4bdc665..a5b159807 100644 --- a/api/cmd/main.go +++ b/api/cmd/main.go @@ -1,4 +1,4 @@ -// Copyright 2019 The OpenSDS Authors. +// Copyright 2019 The soda Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,17 +17,17 @@ package main import ( "os" - "github.com/opensds/multi-cloud/api/pkg/aksk" - "github.com/opensds/multi-cloud/api/pkg/backend" - "github.com/opensds/multi-cloud/api/pkg/block" - "github.com/opensds/multi-cloud/api/pkg/dataflow" - "github.com/opensds/multi-cloud/api/pkg/file" - "github.com/opensds/multi-cloud/api/pkg/filters/auth" - "github.com/opensds/multi-cloud/api/pkg/filters/context" - "github.com/opensds/multi-cloud/api/pkg/filters/logging" - "github.com/opensds/multi-cloud/api/pkg/filters/signature/signer" - "github.com/opensds/multi-cloud/api/pkg/s3" - "github.com/opensds/multi-cloud/api/pkg/utils/obs" + "github.com/soda/multi-cloud/api/pkg/aksk" + "github.com/soda/multi-cloud/api/pkg/backend" + "github.com/soda/multi-cloud/api/pkg/block" + "github.com/soda/multi-cloud/api/pkg/dataflow" + "github.com/soda/multi-cloud/api/pkg/file" + "github.com/soda/multi-cloud/api/pkg/filters/auth" + "github.com/soda/multi-cloud/api/pkg/filters/context" + "github.com/soda/multi-cloud/api/pkg/filters/logging" + "github.com/soda/multi-cloud/api/pkg/filters/signature/signer" + "github.com/soda/multi-cloud/api/pkg/s3" + "github.com/soda/multi-cloud/api/pkg/utils/obs" "github.com/emicklei/go-restful" "github.com/micro/go-micro/v2/web" @@ -61,7 +61,7 @@ func main() { if flag == "s3" { s3ws := new(restful.WebService) s3ws.Path("/") - s3ws.Doc("OpenSDS Multi-Cloud S3 API") + s3ws.Doc("soda Multi-Cloud S3 API") s3ws.Produces(restful.MIME_XML) s3ws.Filter(logging.FilterFactory()) @@ -73,7 +73,7 @@ func main() { } else { ws := new(restful.WebService) ws.Path("/v1") - ws.Doc("OpenSDS Multi-Cloud API") + ws.Doc("soda Multi-Cloud API") ws.Consumes(restful.MIME_JSON) ws.Produces(restful.MIME_JSON) diff --git a/api/cmd/totalcov.html b/api/cmd/totalcov.html index b0d44a232..7f281e259 100644 --- a/api/cmd/totalcov.html +++ b/api/cmd/totalcov.html @@ -54,211 +54,211 @@ @@ -272,7 +272,7 @@
-
-
-