diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86e2ac1124..ed976f41ac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,17 +35,17 @@ jobs: - name: Set RELEASE_NUMBER run: echo "RELEASE_NUMBER=$(echo $RELEASE_VERSION | cut -c2-)" >> $GITHUB_ENV - name: Build linux amd64 binary - run: GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.linux.amd64 go.mozilla.org/sops/v3/cmd/sops && cp dist/sops-${{ env.RELEASE_VERSION }}.linux.amd64 dist/sops-${{ env.RELEASE_VERSION }}.linux + run: GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.linux.amd64 github.com/getsops/sops/v3/v3/cmd/sops && cp dist/sops-${{ env.RELEASE_VERSION }}.linux.amd64 dist/sops-${{ env.RELEASE_VERSION }}.linux - name: Build linux arm64 binary - run: GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.linux.arm64 go.mozilla.org/sops/v3/cmd/sops + run: GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.linux.arm64 github.com/getsops/sops/v3/v3/cmd/sops - name: Build darwin amd64 binary - run: GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.darwin.amd64 go.mozilla.org/sops/v3/cmd/sops + run: GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.darwin.amd64 github.com/getsops/sops/v3/v3/cmd/sops - name: Copy darwin amd64 to have a no-architecture labeled version run: cp dist/sops-${{ env.RELEASE_VERSION }}.darwin.amd64 dist/sops-${{ env.RELEASE_VERSION }}.darwin - name: Build darwin arm64 binary - run: GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.darwin.arm64 go.mozilla.org/sops/v3/cmd/sops + run: GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.darwin.arm64 github.com/getsops/sops/v3/v3/cmd/sops - name: Build windows binary - run: GOOS=windows CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.exe go.mozilla.org/sops/v3/cmd/sops + run: GOOS=windows CGO_ENABLED=0 go build -mod vendor -o dist/sops-${{ env.RELEASE_VERSION }}.exe github.com/getsops/sops/v3/v3/cmd/sops - name: Create release uses: "mozilla/action-automatic-releases@latest" with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 05c833d892..75897a045a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,8 +5,8 @@ Mozilla welcomes contributions from everyone. Here are a few guidelines and inst # Getting started * Make sure you have Go 1.12 or greater installed. You can find information on how to install Go [here](https://golang.org/dl/) -* After following the [Go installation guide](https://golang.org/doc/install), run `go get go.mozilla.org/sops`. This will automatically clone this repository. -* Switch into sops's directory, which will be in `$GOPATH/src/go.mozilla.org/sops`. +* After following the [Go installation guide](https://golang.org/doc/install), run `go get github.com/getsops/sops/v3`. This will automatically clone this repository. +* Switch into sops's directory, which will be in `$GOPATH/src/github.com/getsops/sops/v3`. * Run the tests with `make test`. They should all pass. * Fork the project on GitHub. * Add your fork to git's remotes: diff --git a/Dockerfile b/Dockerfile index d0c58a36f2..6db37f1fa1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.20 -COPY . /go/src/go.mozilla.org/sops -WORKDIR /go/src/go.mozilla.org/sops +COPY . /go/src/github.com/getsops/sops/v3 +WORKDIR /go/src/github.com/getsops/sops/v3 RUN CGO_ENABLED=1 make install RUN apt-get update diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 5305852401..583a83ce0c 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -2,8 +2,8 @@ FROM golang:1.20-alpine3.18 AS builder RUN apk --no-cache add make -COPY . /go/src/go.mozilla.org/sops -WORKDIR /go/src/go.mozilla.org/sops +COPY . /go/src/github.com/getsops/sops/v3 +WORKDIR /go/src/github.com/getsops/sops/v3 RUN CGO_ENABLED=1 make install diff --git a/Makefile b/Makefile index e302a7464f..07eadced01 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -PROJECT := go.mozilla.org/sops/v3 +PROJECT := github.com/getsops/sops/v3/v3 GO := GOPROXY=https://proxy.golang.org go GOLINT := golint @@ -10,7 +10,7 @@ all: test vet generate install functional-tests origin-build: test vet generate install functional-tests-all install: - $(GO) install go.mozilla.org/sops/v3/cmd/sops + $(GO) install github.com/getsops/sops/v3/v3/cmd/sops tag: all git tag -s $(TAGVER) -a -m "$(TAGMSG)" @@ -39,13 +39,13 @@ generate: keyservice/keyservice.pb.go protoc --go_out=plugins=grpc:. $< functional-tests: - $(GO) build -o functional-tests/sops go.mozilla.org/sops/v3/cmd/sops + $(GO) build -o functional-tests/sops github.com/getsops/sops/v3/v3/cmd/sops cd functional-tests && cargo test # Ignored tests are ones that require external services (e.g. AWS KMS) # TODO: Once `--include-ignored` lands in rust stable, switch to that. functional-tests-all: - $(GO) build -o functional-tests/sops go.mozilla.org/sops/v3/cmd/sops + $(GO) build -o functional-tests/sops github.com/getsops/sops/v3/v3/cmd/sops cd functional-tests && cargo test && cargo test -- --ignored # Creates variables during target re-definition. Basically this block allows the particular variables to be used in the final target @@ -56,11 +56,11 @@ build-deb-%: FPM_ARCH = $(word 3,$(subst -, ,$*)) build-deb-%: rm -rf tmppkg mkdir -p tmppkg/usr/local/bin - GOOS=$(OS) GOARCH="$(ARCH)" CGO_ENABLED=0 go build -mod vendor -o tmppkg/usr/local/bin/sops go.mozilla.org/sops/v3/cmd/sops + GOOS=$(OS) GOARCH="$(ARCH)" CGO_ENABLED=0 go build -mod vendor -o tmppkg/usr/local/bin/sops github.com/getsops/sops/v3/v3/cmd/sops fpm -C tmppkg -n sops --license MPL2.0 --vendor mozilla \ --description "Sops is an editor of encrypted files that supports YAML, JSON and BINARY formats and encrypts with AWS KMS and PGP." \ -m "AJ Bahnken " \ - --url https://go.mozilla.org/sops \ + --url https://github.com/getsops/sops/v3 \ --architecture $(FPM_ARCH) \ -v "$$(grep '^const Version' version/version.go |cut -d \" -f 2)" \ -s dir -t deb . @@ -76,11 +76,11 @@ build-rpm-%: FPM_ARCH = $(word 3,$(subst -, ,$*)) build-rpm-%: rm -rf tmppkg mkdir -p tmppkg/usr/local/bin - GOOS=$(OS) GOARCH="$(ARCH)" CGO_ENABLED=0 go build -mod vendor -o tmppkg/usr/local/bin/sops go.mozilla.org/sops/v3/cmd/sops + GOOS=$(OS) GOARCH="$(ARCH)" CGO_ENABLED=0 go build -mod vendor -o tmppkg/usr/local/bin/sops github.com/getsops/sops/v3/v3/cmd/sops fpm -C tmppkg -n sops --license MPL2.0 --vendor mozilla \ --description "Sops is an editor of encrypted files that supports YAML, JSON and BINARY formats and encrypts with AWS KMS and PGP." \ -m "AJ Bahnken " \ - --url https://go.mozilla.org/sops \ + --url https://github.com/getsops/sops/v3 \ --architecture $(FPM_ARCH) \ --rpm-os $(OS) \ -v "$$(grep '^const Version' version/version.go |cut -d \" -f 2)" \ @@ -99,7 +99,7 @@ else fpm -C tmppkg -n sops --license MPL2.0 --vendor mozilla \ --description "Sops is an editor of encrypted files that supports YAML, JSON and BINARY formats and encrypts with AWS KMS and PGP." \ -m "Mozilla Security " \ - --url https://go.mozilla.org/sops \ + --url https://github.com/getsops/sops/v3 \ --architecture x86_64 \ -v "$$(grep '^const Version' version/version.go |cut -d \" -f 2)" \ -s dir -t osxpkg \ diff --git a/README.rst b/README.rst index c44582aee1..30afcd4166 100644 --- a/README.rst +++ b/README.rst @@ -9,8 +9,8 @@ formats and encrypts with AWS KMS, GCP KMS, Azure Key Vault, age, and PGP. ------------ -.. image:: https://pkg.go.dev/badge/go.mozilla.org/sops/v3.svg - :target: https://pkg.go.dev/go.mozilla.org/sops/v3 +.. image:: https://pkg.go.dev/badge/github.com/getsops/sops/v3/v3.svg + :target: https://pkg.go.dev/github.com/getsops/sops/v3/v3 Download -------- @@ -25,9 +25,9 @@ For the adventurous, unstable features are available in the `develop` branch, wh .. code:: bash - $ mkdir -p $GOPATH/src/go.mozilla.org/sops/ - $ git clone https://github.com/mozilla/sops.git $GOPATH/src/go.mozilla.org/sops/ - $ cd $GOPATH/src/go.mozilla.org/sops/ + $ mkdir -p $GOPATH/src/github.com/getsops/sops/v3/ + $ git clone https://github.com/mozilla/sops.git $GOPATH/src/github.com/getsops/sops/v3/ + $ cd $GOPATH/src/github.com/getsops/sops/v3/ $ git checkout develop $ make install @@ -44,7 +44,7 @@ If you don't have Go installed, set it up with: Or whatever variation of the above fits your system and shell. -To use **sops** as a library, take a look at the `decrypt package `_. +To use **sops** as a library, take a look at the `decrypt package `_. .. sectnum:: .. contents:: Table of Contents diff --git a/aes/cipher.go b/aes/cipher.go index 317df63160..d4ad74adde 100644 --- a/aes/cipher.go +++ b/aes/cipher.go @@ -1,7 +1,7 @@ /* Package aes defines a Cipher that uses 256-bit AES-GCM authenticated encryption to encrypt values the SOPS tree. */ -package aes //import "go.mozilla.org/sops/v3/aes" +package aes //import "github.com/getsops/sops/v3/aes" import ( cryptoaes "crypto/aes" @@ -14,8 +14,8 @@ import ( "strings" "github.com/sirupsen/logrus" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/logging" ) var log *logrus.Logger diff --git a/aes/cipher_test.go b/aes/cipher_test.go index 2a3ba1edd6..4d53510aab 100644 --- a/aes/cipher_test.go +++ b/aes/cipher_test.go @@ -7,7 +7,7 @@ import ( "testing/quick" "github.com/stretchr/testify/assert" - "go.mozilla.org/sops/v3" + "github.com/getsops/sops/v3" ) func TestDecrypt(t *testing.T) { diff --git a/age/keysource.go b/age/keysource.go index d054313830..b0022ee77d 100644 --- a/age/keysource.go +++ b/age/keysource.go @@ -12,7 +12,7 @@ import ( "filippo.io/age" "filippo.io/age/armor" "github.com/sirupsen/logrus" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" ) const ( diff --git a/audit/audit.go b/audit/audit.go index b52215077d..035783e4ed 100644 --- a/audit/audit.go +++ b/audit/audit.go @@ -14,7 +14,7 @@ import ( "gopkg.in/yaml.v3" "github.com/sirupsen/logrus" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" ) var log *logrus.Logger diff --git a/azkv/keysource.go b/azkv/keysource.go index 5724aab84d..d32b880c37 100644 --- a/azkv/keysource.go +++ b/azkv/keysource.go @@ -1,9 +1,9 @@ /* -Package azkv contains an implementation of the go.mozilla.org/sops/v3/keys.MasterKey +Package azkv contains an implementation of the github.com/getsops/sops/v3/keys.MasterKey interface that encrypts and decrypts the data key using Azure Key Vault with the Azure Key Vault Keys client module for Go. */ -package azkv // import "go.mozilla.org/sops/v3/azkv" +package azkv // import "github.com/getsops/sops/v3/azkv" import ( "context" @@ -19,7 +19,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys" "github.com/sirupsen/logrus" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" ) var ( diff --git a/cmd/sops/common/common.go b/cmd/sops/common/common.go index cde08076b4..b675195bc2 100644 --- a/cmd/sops/common/common.go +++ b/cmd/sops/common/common.go @@ -10,17 +10,17 @@ import ( "github.com/fatih/color" wordwrap "github.com/mitchellh/go-wordwrap" "github.com/urfave/cli" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/cmd/sops/codes" - . "go.mozilla.org/sops/v3/cmd/sops/formats" - "go.mozilla.org/sops/v3/keys" - "go.mozilla.org/sops/v3/keyservice" - "go.mozilla.org/sops/v3/kms" - "go.mozilla.org/sops/v3/stores/dotenv" - "go.mozilla.org/sops/v3/stores/ini" - "go.mozilla.org/sops/v3/stores/json" - "go.mozilla.org/sops/v3/stores/yaml" - "go.mozilla.org/sops/v3/version" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/cmd/sops/codes" + . "github.com/getsops/sops/v3/cmd/sops/formats" + "github.com/getsops/sops/v3/keys" + "github.com/getsops/sops/v3/keyservice" + "github.com/getsops/sops/v3/kms" + "github.com/getsops/sops/v3/stores/dotenv" + "github.com/getsops/sops/v3/stores/ini" + "github.com/getsops/sops/v3/stores/json" + "github.com/getsops/sops/v3/stores/yaml" + "github.com/getsops/sops/v3/version" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/sops/decrypt.go b/cmd/sops/decrypt.go index f348b16a7e..680af4cad6 100644 --- a/cmd/sops/decrypt.go +++ b/cmd/sops/decrypt.go @@ -3,10 +3,10 @@ package main import ( "fmt" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/cmd/sops/codes" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/keyservice" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/cmd/sops/codes" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/keyservice" ) type decryptOpts struct { diff --git a/cmd/sops/edit.go b/cmd/sops/edit.go index d1d5e6a759..e72d8fb23c 100644 --- a/cmd/sops/edit.go +++ b/cmd/sops/edit.go @@ -16,11 +16,11 @@ import ( "path/filepath" "github.com/google/shlex" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/cmd/sops/codes" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/keyservice" - "go.mozilla.org/sops/v3/version" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/cmd/sops/codes" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/keyservice" + "github.com/getsops/sops/v3/version" ) type editOpts struct { diff --git a/cmd/sops/encrypt.go b/cmd/sops/encrypt.go index 1aa09eeba4..195833ae63 100644 --- a/cmd/sops/encrypt.go +++ b/cmd/sops/encrypt.go @@ -7,11 +7,11 @@ import ( "fmt" wordwrap "github.com/mitchellh/go-wordwrap" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/cmd/sops/codes" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/keyservice" - "go.mozilla.org/sops/v3/version" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/cmd/sops/codes" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/keyservice" + "github.com/getsops/sops/v3/version" ) type encryptOpts struct { diff --git a/cmd/sops/main.go b/cmd/sops/main.go index 2deea86715..35dc5527ff 100644 --- a/cmd/sops/main.go +++ b/cmd/sops/main.go @@ -1,4 +1,4 @@ -package main //import "go.mozilla.org/sops/v3/cmd/sops" +package main //import "github.com/getsops/sops/v3/cmd/sops" import ( encodingjson "encoding/json" @@ -15,29 +15,29 @@ import ( "github.com/sirupsen/logrus" "github.com/urfave/cli" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/aes" - "go.mozilla.org/sops/v3/age" - _ "go.mozilla.org/sops/v3/audit" - "go.mozilla.org/sops/v3/azkv" - "go.mozilla.org/sops/v3/cmd/sops/codes" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/cmd/sops/subcommand/exec" - "go.mozilla.org/sops/v3/cmd/sops/subcommand/groups" - keyservicecmd "go.mozilla.org/sops/v3/cmd/sops/subcommand/keyservice" - publishcmd "go.mozilla.org/sops/v3/cmd/sops/subcommand/publish" - "go.mozilla.org/sops/v3/cmd/sops/subcommand/updatekeys" - "go.mozilla.org/sops/v3/config" - "go.mozilla.org/sops/v3/gcpkms" - "go.mozilla.org/sops/v3/hcvault" - "go.mozilla.org/sops/v3/keys" - "go.mozilla.org/sops/v3/keyservice" - "go.mozilla.org/sops/v3/kms" - "go.mozilla.org/sops/v3/logging" - "go.mozilla.org/sops/v3/pgp" - "go.mozilla.org/sops/v3/stores/dotenv" - "go.mozilla.org/sops/v3/stores/json" - "go.mozilla.org/sops/v3/version" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/aes" + "github.com/getsops/sops/v3/age" + _ "github.com/getsops/sops/v3/audit" + "github.com/getsops/sops/v3/azkv" + "github.com/getsops/sops/v3/cmd/sops/codes" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/cmd/sops/subcommand/exec" + "github.com/getsops/sops/v3/cmd/sops/subcommand/groups" + keyservicecmd "github.com/getsops/sops/v3/cmd/sops/subcommand/keyservice" + publishcmd "github.com/getsops/sops/v3/cmd/sops/subcommand/publish" + "github.com/getsops/sops/v3/cmd/sops/subcommand/updatekeys" + "github.com/getsops/sops/v3/config" + "github.com/getsops/sops/v3/gcpkms" + "github.com/getsops/sops/v3/hcvault" + "github.com/getsops/sops/v3/keys" + "github.com/getsops/sops/v3/keyservice" + "github.com/getsops/sops/v3/kms" + "github.com/getsops/sops/v3/logging" + "github.com/getsops/sops/v3/pgp" + "github.com/getsops/sops/v3/stores/dotenv" + "github.com/getsops/sops/v3/stores/json" + "github.com/getsops/sops/v3/version" "google.golang.org/grpc" ) diff --git a/cmd/sops/rotate.go b/cmd/sops/rotate.go index 097fcd2a16..1818adae48 100644 --- a/cmd/sops/rotate.go +++ b/cmd/sops/rotate.go @@ -3,12 +3,12 @@ package main import ( "fmt" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/audit" - "go.mozilla.org/sops/v3/cmd/sops/codes" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/keys" - "go.mozilla.org/sops/v3/keyservice" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/audit" + "github.com/getsops/sops/v3/cmd/sops/codes" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/keys" + "github.com/getsops/sops/v3/keyservice" ) type rotateOpts struct { diff --git a/cmd/sops/set.go b/cmd/sops/set.go index bc94e40594..976a066ac5 100644 --- a/cmd/sops/set.go +++ b/cmd/sops/set.go @@ -3,10 +3,10 @@ package main import ( "fmt" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/cmd/sops/codes" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/keyservice" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/cmd/sops/codes" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/keyservice" ) type setOpts struct { diff --git a/cmd/sops/subcommand/exec/exec.go b/cmd/sops/subcommand/exec/exec.go index cd8d33be5f..720b2431dc 100644 --- a/cmd/sops/subcommand/exec/exec.go +++ b/cmd/sops/subcommand/exec/exec.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" "github.com/sirupsen/logrus" ) diff --git a/cmd/sops/subcommand/groups/add.go b/cmd/sops/subcommand/groups/add.go index 33e3e04611..acd6b4619f 100644 --- a/cmd/sops/subcommand/groups/add.go +++ b/cmd/sops/subcommand/groups/add.go @@ -3,9 +3,9 @@ package groups import ( "os" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/keyservice" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/keyservice" ) // AddOpts are the options for adding a key group to a SOPS file diff --git a/cmd/sops/subcommand/groups/delete.go b/cmd/sops/subcommand/groups/delete.go index 5e70cdde73..9a101709c3 100644 --- a/cmd/sops/subcommand/groups/delete.go +++ b/cmd/sops/subcommand/groups/delete.go @@ -5,9 +5,9 @@ import ( "fmt" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/keyservice" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/keyservice" ) // DeleteOpts are the options for deleting a key group from a SOPS file diff --git a/cmd/sops/subcommand/keyservice/keyservice.go b/cmd/sops/subcommand/keyservice/keyservice.go index 6a92efaf1e..c28f636904 100644 --- a/cmd/sops/subcommand/keyservice/keyservice.go +++ b/cmd/sops/subcommand/keyservice/keyservice.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "go.mozilla.org/sops/v3/keyservice" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/keyservice" + "github.com/getsops/sops/v3/logging" "github.com/sirupsen/logrus" "google.golang.org/grpc" diff --git a/cmd/sops/subcommand/publish/publish.go b/cmd/sops/subcommand/publish/publish.go index 4f3804ca0a..ee0dd27aeb 100644 --- a/cmd/sops/subcommand/publish/publish.go +++ b/cmd/sops/subcommand/publish/publish.go @@ -7,14 +7,14 @@ import ( "path/filepath" "strings" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/cmd/sops/codes" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/config" - "go.mozilla.org/sops/v3/keyservice" - "go.mozilla.org/sops/v3/logging" - "go.mozilla.org/sops/v3/publish" - "go.mozilla.org/sops/v3/version" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/cmd/sops/codes" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/config" + "github.com/getsops/sops/v3/keyservice" + "github.com/getsops/sops/v3/logging" + "github.com/getsops/sops/v3/publish" + "github.com/getsops/sops/v3/version" "github.com/sirupsen/logrus" ) diff --git a/cmd/sops/subcommand/updatekeys/updatekeys.go b/cmd/sops/subcommand/updatekeys/updatekeys.go index 2b00989c0b..6bb1058645 100644 --- a/cmd/sops/subcommand/updatekeys/updatekeys.go +++ b/cmd/sops/subcommand/updatekeys/updatekeys.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - "go.mozilla.org/sops/v3/cmd/sops/codes" - "go.mozilla.org/sops/v3/cmd/sops/common" - "go.mozilla.org/sops/v3/config" - "go.mozilla.org/sops/v3/keyservice" + "github.com/getsops/sops/v3/cmd/sops/codes" + "github.com/getsops/sops/v3/cmd/sops/common" + "github.com/getsops/sops/v3/config" + "github.com/getsops/sops/v3/keyservice" ) // Opts represents key operation options and config diff --git a/config/config.go b/config/config.go index a4db7b868e..a965930688 100644 --- a/config/config.go +++ b/config/config.go @@ -1,7 +1,7 @@ /* Package config provides a way to find and load SOPS configuration files */ -package config //import "go.mozilla.org/sops/v3/config" +package config //import "github.com/getsops/sops/v3/config" import ( "fmt" @@ -13,15 +13,15 @@ import ( "strings" "github.com/sirupsen/logrus" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/age" - "go.mozilla.org/sops/v3/azkv" - "go.mozilla.org/sops/v3/gcpkms" - "go.mozilla.org/sops/v3/hcvault" - "go.mozilla.org/sops/v3/kms" - "go.mozilla.org/sops/v3/logging" - "go.mozilla.org/sops/v3/pgp" - "go.mozilla.org/sops/v3/publish" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/age" + "github.com/getsops/sops/v3/azkv" + "github.com/getsops/sops/v3/gcpkms" + "github.com/getsops/sops/v3/hcvault" + "github.com/getsops/sops/v3/kms" + "github.com/getsops/sops/v3/logging" + "github.com/getsops/sops/v3/pgp" + "github.com/getsops/sops/v3/publish" "gopkg.in/yaml.v3" ) diff --git a/decrypt/decrypt.go b/decrypt/decrypt.go index 6fd4a4fbe6..506132894c 100644 --- a/decrypt/decrypt.go +++ b/decrypt/decrypt.go @@ -2,16 +2,16 @@ Package decrypt is the external API other Go programs can use to decrypt SOPS files. It is the only package in SOPS with a stable API. */ -package decrypt // import "go.mozilla.org/sops/v3/decrypt" +package decrypt // import "github.com/getsops/sops/v3/decrypt" import ( "fmt" "io/ioutil" "time" - "go.mozilla.org/sops/v3/aes" - "go.mozilla.org/sops/v3/cmd/sops/common" - . "go.mozilla.org/sops/v3/cmd/sops/formats" // Re-export + "github.com/getsops/sops/v3/aes" + "github.com/getsops/sops/v3/cmd/sops/common" + . "github.com/getsops/sops/v3/cmd/sops/formats" // Re-export ) // File is a wrapper around Data that reads a local encrypted diff --git a/decrypt/example_test.go b/decrypt/example_test.go index 19af98be71..0ccdc87aa2 100644 --- a/decrypt/example_test.go +++ b/decrypt/example_test.go @@ -3,7 +3,7 @@ package decrypt import ( "encoding/json" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" "github.com/sirupsen/logrus" ) diff --git a/gcpkms/keysource.go b/gcpkms/keysource.go index d549b32b8f..c64cde7ed7 100644 --- a/gcpkms/keysource.go +++ b/gcpkms/keysource.go @@ -1,4 +1,4 @@ -package gcpkms // import "go.mozilla.org/sops/v3/gcpkms" +package gcpkms // import "github.com/getsops/sops/v3/gcpkms" import ( "context" @@ -15,7 +15,7 @@ import ( kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" "google.golang.org/grpc" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" ) const ( diff --git a/go.mod b/go.mod index 78b060e0f0..a8c8bd573d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.mozilla.org/sops/v3 +module github.com/getsops/sops/v3 go 1.19 diff --git a/hcvault/keysource.go b/hcvault/keysource.go index a1e1736e1e..482540cd7f 100644 --- a/hcvault/keysource.go +++ b/hcvault/keysource.go @@ -18,7 +18,7 @@ import ( "github.com/mitchellh/go-homedir" "github.com/sirupsen/logrus" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" ) func init() { diff --git a/keyservice/keyservice.go b/keyservice/keyservice.go index 103e3e6dc7..321af79420 100644 --- a/keyservice/keyservice.go +++ b/keyservice/keyservice.go @@ -7,13 +7,13 @@ package keyservice import ( "fmt" - "go.mozilla.org/sops/v3/age" - "go.mozilla.org/sops/v3/azkv" - "go.mozilla.org/sops/v3/gcpkms" - "go.mozilla.org/sops/v3/hcvault" - "go.mozilla.org/sops/v3/keys" - "go.mozilla.org/sops/v3/kms" - "go.mozilla.org/sops/v3/pgp" + "github.com/getsops/sops/v3/age" + "github.com/getsops/sops/v3/azkv" + "github.com/getsops/sops/v3/gcpkms" + "github.com/getsops/sops/v3/hcvault" + "github.com/getsops/sops/v3/keys" + "github.com/getsops/sops/v3/kms" + "github.com/getsops/sops/v3/pgp" ) // KeyFromMasterKey converts a SOPS internal MasterKey to an RPC Key that can be serialized with Protocol Buffers diff --git a/keyservice/server.go b/keyservice/server.go index 08249ff24b..82c1a4855d 100644 --- a/keyservice/server.go +++ b/keyservice/server.go @@ -3,12 +3,12 @@ package keyservice import ( "fmt" - "go.mozilla.org/sops/v3/age" - "go.mozilla.org/sops/v3/azkv" - "go.mozilla.org/sops/v3/gcpkms" - "go.mozilla.org/sops/v3/hcvault" - "go.mozilla.org/sops/v3/kms" - "go.mozilla.org/sops/v3/pgp" + "github.com/getsops/sops/v3/age" + "github.com/getsops/sops/v3/azkv" + "github.com/getsops/sops/v3/gcpkms" + "github.com/getsops/sops/v3/hcvault" + "github.com/getsops/sops/v3/kms" + "github.com/getsops/sops/v3/pgp" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/kms/keysource.go b/kms/keysource.go index 8ce11ff4c2..05b7479dd2 100644 --- a/kms/keysource.go +++ b/kms/keysource.go @@ -1,9 +1,9 @@ /* -Package kms contains an implementation of the go.mozilla.org/sops/v3.MasterKey +Package kms contains an implementation of the github.com/getsops/sops/v3.MasterKey interface that encrypts and decrypts the data key using AWS KMS with the SDK for Go V2. */ -package kms //import "go.mozilla.org/sops/v3/kms" +package kms //import "github.com/getsops/sops/v3/kms" import ( "context" @@ -20,7 +20,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/sts" "github.com/sirupsen/logrus" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" ) const ( diff --git a/make_download_page.sh b/make_download_page.sh index a3b7d23f3c..e773cb5737 100644 --- a/make_download_page.sh +++ b/make_download_page.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash [ ! -d dist ] && mkdir dist -echo -e "\nSops download page>\n\n

Sops download page

\n

go.mozilla.org/sops

\n" > index.html +echo -e "\nSops download page>\n\n

Sops download page

\n

github.com/getsops/sops/v3

\n
" > index.html IFS=$'\n' for dist in $(aws s3 ls s3://go.mozilla.org/sops/dist/ | grep -P "deb|rpm"); do ts=$(echo $dist|awk '{print $1,$2}') size=$(echo $dist|awk '{print $3}') pkg=$(echo $dist|awk '{print $4}') - echo -e "" >> index.html + echo -e "" >> index.html done echo -e "
$ts$size$pkg
$ts$size$pkg
\n\n" >> index.html diff --git a/pgp/keysource.go b/pgp/keysource.go index c82b4245ac..2942c6f746 100644 --- a/pgp/keysource.go +++ b/pgp/keysource.go @@ -1,10 +1,10 @@ /* -Package pgp contains an implementation of the go.mozilla.org/sops/v3.MasterKey +Package pgp contains an implementation of the github.com/getsops/sops/v3.MasterKey interface that encrypts and decrypts the data key by first trying with the github.com/ProtonMail/go-crypto/openpgp package and if that fails, by calling the "gpg" binary. */ -package pgp //import "go.mozilla.org/sops/v3/pgp" +package pgp //import "github.com/getsops/sops/v3/pgp" import ( "bytes" @@ -22,7 +22,7 @@ import ( "github.com/ProtonMail/go-crypto/openpgp/armor" "github.com/sirupsen/logrus" gpgagent "go.mozilla.org/gopgagent" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" "golang.org/x/term" ) diff --git a/publish/vault.go b/publish/vault.go index bfc5b3ba0f..6f857cd019 100644 --- a/publish/vault.go +++ b/publish/vault.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" vault "github.com/hashicorp/vault/api" - "go.mozilla.org/sops/v3/logging" + "github.com/getsops/sops/v3/logging" "github.com/sirupsen/logrus" ) diff --git a/sops.go b/sops.go index a6caa0df87..1d39d881d8 100644 --- a/sops.go +++ b/sops.go @@ -2,10 +2,10 @@ Package sops manages JSON, YAML and BINARY documents to be encrypted or decrypted. This package should not be used directly. Instead, Sops users should install the -command line client via `go get -u go.mozilla.org/sops/v3/cmd/sops`, or use the -decryption helper provided at `go.mozilla.org/sops/v3/decrypt`. +command line client via `go get -u github.com/getsops/sops/v3/cmd/sops`, or use the +decryption helper provided at `github.com/getsops/sops/v3/decrypt`. -We do not guarantee API stability for any package other than `go.mozilla.org/sops/v3/decrypt`. +We do not guarantee API stability for any package other than `github.com/getsops/sops/v3/decrypt`. A Sops document is a Tree composed of a data branch with arbitrary key/value pairs and a metadata branch with encryption and integrity information. @@ -34,7 +34,7 @@ be recalculated and compared with the MAC stored in the document to verify that fraudulent changes have been applied. The MAC covers keys and values as well as their ordering. */ -package sops //import "go.mozilla.org/sops/v3" +package sops //import "github.com/getsops/sops/v3" import ( "crypto/rand" @@ -47,11 +47,11 @@ import ( "time" "github.com/sirupsen/logrus" - "go.mozilla.org/sops/v3/audit" - "go.mozilla.org/sops/v3/keys" - "go.mozilla.org/sops/v3/keyservice" - "go.mozilla.org/sops/v3/logging" - "go.mozilla.org/sops/v3/shamir" + "github.com/getsops/sops/v3/audit" + "github.com/getsops/sops/v3/keys" + "github.com/getsops/sops/v3/keyservice" + "github.com/getsops/sops/v3/logging" + "github.com/getsops/sops/v3/shamir" "golang.org/x/net/context" ) diff --git a/stores/dotenv/store.go b/stores/dotenv/store.go index 8add8a097f..dedf8817c8 100644 --- a/stores/dotenv/store.go +++ b/stores/dotenv/store.go @@ -1,4 +1,4 @@ -package dotenv //import "go.mozilla.org/sops/v3/stores/dotenv" +package dotenv //import "github.com/getsops/sops/v3/stores/dotenv" import ( "bytes" @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/stores" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/stores" ) // SopsPrefix is the prefix for all metadatada entry keys diff --git a/stores/dotenv/store_test.go b/stores/dotenv/store_test.go index f4bd2cc852..163ddb0229 100644 --- a/stores/dotenv/store_test.go +++ b/stores/dotenv/store_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mozilla.org/sops/v3" + "github.com/getsops/sops/v3" ) var PLAIN = []byte(strings.TrimLeft(` diff --git a/stores/ini/store.go b/stores/ini/store.go index df54052948..6485467f13 100644 --- a/stores/ini/store.go +++ b/stores/ini/store.go @@ -1,4 +1,4 @@ -package ini //import "go.mozilla.org/sops/v3/stores/ini" +package ini //import "github.com/getsops/sops/v3/stores/ini" import ( "bytes" @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/stores" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/stores" "gopkg.in/ini.v1" ) diff --git a/stores/ini/store_test.go b/stores/ini/store_test.go index 9be1629578..3e833b54cb 100644 --- a/stores/ini/store_test.go +++ b/stores/ini/store_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mozilla.org/sops/v3" + "github.com/getsops/sops/v3" ) func TestDecodeIni(t *testing.T) { diff --git a/stores/json/store.go b/stores/json/store.go index 574b15206c..1b18300f77 100644 --- a/stores/json/store.go +++ b/stores/json/store.go @@ -1,4 +1,4 @@ -package json //import "go.mozilla.org/sops/v3/stores/json" +package json //import "github.com/getsops/sops/v3/stores/json" import ( "bytes" @@ -6,8 +6,8 @@ import ( "fmt" "io" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/stores" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/stores" ) // Store handles storage of JSON data. diff --git a/stores/json/store_test.go b/stores/json/store_test.go index 81066f174f..d9dd82733c 100644 --- a/stores/json/store_test.go +++ b/stores/json/store_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mozilla.org/sops/v3" + "github.com/getsops/sops/v3" ) func TestDecodeJSON(t *testing.T) { diff --git a/stores/stores.go b/stores/stores.go index da8781ab2e..420c115c75 100644 --- a/stores/stores.go +++ b/stores/stores.go @@ -14,13 +14,13 @@ import ( "fmt" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/age" - "go.mozilla.org/sops/v3/azkv" - "go.mozilla.org/sops/v3/gcpkms" - "go.mozilla.org/sops/v3/hcvault" - "go.mozilla.org/sops/v3/kms" - "go.mozilla.org/sops/v3/pgp" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/age" + "github.com/getsops/sops/v3/azkv" + "github.com/getsops/sops/v3/gcpkms" + "github.com/getsops/sops/v3/hcvault" + "github.com/getsops/sops/v3/kms" + "github.com/getsops/sops/v3/pgp" ) // SopsFile is a struct used by the stores as a helper to unmarshal the SOPS metadata diff --git a/stores/yaml/store.go b/stores/yaml/store.go index 0a95d7c6ad..4782428b61 100644 --- a/stores/yaml/store.go +++ b/stores/yaml/store.go @@ -1,4 +1,4 @@ -package yaml //import "go.mozilla.org/sops/v3/stores/yaml" +package yaml //import "github.com/getsops/sops/v3/stores/yaml" import ( "bytes" @@ -7,8 +7,8 @@ import ( "strings" "gopkg.in/yaml.v3" - "go.mozilla.org/sops/v3" - "go.mozilla.org/sops/v3/stores" + "github.com/getsops/sops/v3" + "github.com/getsops/sops/v3/stores" ) // Store handles storage of YAML data diff --git a/stores/yaml/store_test.go b/stores/yaml/store_test.go index 245a43104a..bf0e1bfaa3 100644 --- a/stores/yaml/store_test.go +++ b/stores/yaml/store_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mozilla.org/sops/v3" + "github.com/getsops/sops/v3" ) var PLAIN = []byte(`--- diff --git a/version/version.go b/version/version.go index 3b00d12d9c..db73522a97 100644 --- a/version/version.go +++ b/version/version.go @@ -28,7 +28,7 @@ func PrintVersion(c *cli.Context) { out += fmt.Sprintf("\n[warning] failed to compare current version with latest: %v\n", err) } if outdated { - out += fmt.Sprintf("\n[info] sops %s is available, update with `go get -u go.mozilla.org/sops/v3/cmd/sops`\n", upstreamVersion) + out += fmt.Sprintf("\n[info] sops %s is available, update with `go get -u github.com/getsops/sops/v3/cmd/sops`\n", upstreamVersion) } else { out += " (latest)\n" }