restructuring code to use go module as a client library

.github/workflows/pages.yaml

@@ -27,10 +27,10 @@ jobs:
         run: |
           cp scripts/install/* pages/
           mkdir -p pages/k8s/samples/deploy
-          cp k8s/config/crd/bases/slv.oss.amagi.com_slvs.yaml pages/k8s/crd.yaml
-          cp k8s/deploy/operator.yaml pages/k8s/samples/deploy/operator.yaml
-          cp k8s/deploy/job.yaml pages/k8s/samples/deploy/job.yaml
-          cp k8s/config/samples/slv_v1_slv.yaml pages/k8s/samples/pets.slv.yaml
+          cp internal/k8s/config/crd/bases/slv.oss.amagi.com_slvs.yaml pages/k8s/crd.yaml
+          cp internal/k8s/deploy/operator.yaml pages/k8s/samples/deploy/operator.yaml
+          cp internal/k8s/deploy/job.yaml pages/k8s/samples/deploy/job.yaml
+          cp internal/k8s/config/samples/slv_v1_slv.yaml pages/k8s/samples/pets.slv.yaml
       - name: Setup Pages
         uses: actions/configure-pages@v4
       - name: Upload artifact

.gitignore

@@ -3,4 +3,4 @@ dist/
 .DS_Store
 slv-dev
 .vscode
-k8s/bin/*
+internal/k8s/bin/*

.goreleaser.yaml

@@ -1,35 +1,37 @@
+version: 2
 project_name: slv
 builds:
   - id: slv
     binary: slv
-    main: ./cli
+    main: ./internal/cli
     env:
       - CGO_ENABLED=0
-    ldflags: "-X oss.amagi.com/slv.version={{.Version}} -X oss.amagi.com/slv.commitDate={{.CommitDate}} -X oss.amagi.com/slv.fullCommit={{.FullCommit}} -X oss.amagi.com/slv.releaseURL={{.ReleaseURL}}"
+    ldflags: "-X oss.amagi.com/slv/internal/core/config.version={{.Version}} -X oss.amagi.com/slv/internal/core/config.commitDate={{.CommitDate}} -X oss.amagi.com/slv/internal/core/config.fullCommit={{.FullCommit}} -X oss.amagi.com/slv/internal/core/config.releaseURL={{.ReleaseURL}}"
     targets:
       - darwin_amd64
       - darwin_arm64
       - linux_amd64
       - linux_arm64
       - linux_arm
       - windows_amd64
+      - windows_arm64
   - id: slv-k8s-operator
     binary: slv-k8s-operator
-    main: ./k8s/cmd
+    main: ./internal/k8s/cmd
     env:
       - CGO_ENABLED=0
-    ldflags: "-X oss.amagi.com/slv.version={{.Version}} -X oss.amagi.com/slv.commitDate={{.CommitDate}} -X oss.amagi.com/slv.fullCommit={{.FullCommit}} -X oss.amagi.com/slv.releaseURL={{.ReleaseURL}}"
+    ldflags: "-X oss.amagi.com/slv/internal/core/config.version={{.Version}} -X oss.amagi.com/slv/internal/core/config.commitDate={{.CommitDate}} -X oss.amagi.com/slv/internal/core/config.fullCommit={{.FullCommit}} -X oss.amagi.com/slv/internal/core/config.releaseURL={{.ReleaseURL}}"
     goarch:
       - amd64
       - arm64
     goos:
       - linux
   - id: slv-k8s-job
     binary: slv-k8s-job
-    main: ./k8s/job
+    main: ./internal/k8s/job
     env:
       - CGO_ENABLED=0
-    ldflags: "-X oss.amagi.com/slv.version={{.Version}} -X oss.amagi.com/slv.commitDate={{.CommitDate}} -X oss.amagi.com/slv.fullCommit={{.FullCommit}} -X oss.amagi.com/slv.releaseURL={{.ReleaseURL}}"
+    ldflags: "-X oss.amagi.com/slv/internal/core/config.version={{.Version}} -X oss.amagi.com/slv/internal/core/config.commitDate={{.CommitDate}} -X oss.amagi.com/slv/internal/core/config.fullCommit={{.FullCommit}} -X oss.amagi.com/slv/internal/core/config.releaseURL={{.ReleaseURL}}"
     goarch:
       - amd64
       - arm64

README.md

@@ -106,5 +106,5 @@ Once shared, the other environments can access the vault using their respective
 
 ## Integrations
 Some of the integrations that SLV currently supports are:
-- [Kubernetes](/k8s/README.md)
+- [Kubernetes](/internal/k8s/README.md)
 - [GitHub Actions](https://github.com/amagioss/slv-action)

go.mod

@@ -4,7 +4,7 @@ go 1.22.0
 
 require (
 	dev.shib.me/xipher v1.4.0
-	github.com/aws/aws-sdk-go v1.54.1
+	github.com/aws/aws-sdk-go v1.54.2
 	github.com/fatih/color v1.17.0
 	github.com/go-git/go-git/v5 v5.12.0
 	github.com/go-logr/logr v1.4.2
@@ -100,7 +100,7 @@ require (
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/mod v0.18.0
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect

go.sum

@@ -27,8 +27,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/aws/aws-sdk-go v1.54.1 h1:+ULL7oLC+v3T00fOMIohUarPI3SR3oyDd6FBEvgdhvs=
-github.com/aws/aws-sdk-go v1.54.1/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.54.2 h1:Wo6AVWcleNHrYa48YzfYz60hzxGRqsJrK5s/qePe+3I=
+github.com/aws/aws-sdk-go v1.54.2/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
@@ -250,8 +250,8 @@ golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU
 golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
 golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 h1:LoYXNGAShUG3m/ehNk4iFctuhGX/+R1ZpfJ4/ia80JM=
-golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

cli/internal/commands/cmdenv/add.go → internal/cli/commands/cmdenv/add.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/environments"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/environments"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func envAddCommand() *cobra.Command {

cli/internal/commands/cmdenv/const.go → internal/cli/commands/cmdenv/const.go

@@ -2,7 +2,7 @@ package cmdenv
 
 import (
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
 )
 
 var (

cli/internal/commands/cmdenv/delete.go → internal/cli/commands/cmdenv/delete.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/input"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/input"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func envDeleteCommand() *cobra.Command {

cli/internal/commands/cmdenv/kms.go → internal/cli/commands/cmdenv/kms.go

@@ -4,10 +4,10 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/environments"
-	"oss.amagi.com/slv/core/environments/providers"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/environments"
+	"oss.amagi.com/slv/internal/core/environments/providers"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func newKMSEnvCommand(kmsName, kmsProviderDesc string, keyIdFlag utils.FlagDef) *cobra.Command {

cli/internal/commands/cmdenv/new.go → internal/cli/commands/cmdenv/new.go

@@ -5,12 +5,12 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/crypto"
-	"oss.amagi.com/slv/core/environments"
-	"oss.amagi.com/slv/core/environments/providers"
-	"oss.amagi.com/slv/core/input"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/crypto"
+	"oss.amagi.com/slv/internal/core/environments"
+	"oss.amagi.com/slv/internal/core/environments/providers"
+	"oss.amagi.com/slv/internal/core/input"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func envNewCommand() *cobra.Command {

cli/internal/commands/cmdenv/searchlist.go → internal/cli/commands/cmdenv/searchlist.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/environments"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/environments"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func envListSearchCommand() *cobra.Command {

cli/internal/commands/cmdenv/self.go → internal/cli/commands/cmdenv/self.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/environments"
-	"oss.amagi.com/slv/core/input"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/environments"
+	"oss.amagi.com/slv/internal/core/input"
 )
 
 func envSelfCommand() *cobra.Command {

cli/internal/commands/cmdprofile/commons.go → internal/cli/commands/cmdprofile/commons.go

@@ -2,7 +2,7 @@ package cmdprofile
 
 import (
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
 )
 
 var (

cli/internal/commands/cmdprofile/default.go → internal/cli/commands/cmdprofile/default.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func profileDefaultCommand() *cobra.Command {

cli/internal/commands/cmdprofile/delete.go → internal/cli/commands/cmdprofile/delete.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func profileDeleteCommand() *cobra.Command {

cli/internal/commands/cmdprofile/list.go → internal/cli/commands/cmdprofile/list.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func profileListCommand() *cobra.Command {

cli/internal/commands/cmdprofile/new.go → internal/cli/commands/cmdprofile/new.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func profileNewCommand() *cobra.Command {

cli/internal/commands/cmdprofile/sync.go → internal/cli/commands/cmdprofile/sync.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func profilePullCommand() *cobra.Command {

cli/internal/commands/cmdslv/slv.go → internal/cli/commands/cmdslv/slv.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv"
-	"oss.amagi.com/slv/cli/internal/commands/cmdenv"
-	"oss.amagi.com/slv/cli/internal/commands/cmdprofile"
-	"oss.amagi.com/slv/cli/internal/commands/cmdsystem"
-	"oss.amagi.com/slv/cli/internal/commands/cmdvault"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
+	"oss.amagi.com/slv/internal/cli/commands/cmdenv"
+	"oss.amagi.com/slv/internal/cli/commands/cmdprofile"
+	"oss.amagi.com/slv/internal/cli/commands/cmdsystem"
+	"oss.amagi.com/slv/internal/cli/commands/cmdvault"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/config"
 )
 
 var (
@@ -33,7 +33,7 @@ func slvCommand() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			version, _ := cmd.Flags().GetBool(versionFlag.Name)
 			if version {
-				fmt.Println(slv.VersionInfo())
+				fmt.Println(config.VersionInfo())
 			} else {
 				cmd.Help()
 			}

cli/internal/commands/cmdslv/version.go → internal/cli/commands/cmdslv/version.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv"
+	"oss.amagi.com/slv/internal/core/config"
 )
 
 func versionCommand() *cobra.Command {
@@ -15,7 +15,7 @@ func versionCommand() *cobra.Command {
 		Use:   "version",
 		Short: "Show version information",
 		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Println(slv.VersionInfo())
+			fmt.Println(config.VersionInfo())
 		},
 	}
 	return versionCmd

cli/internal/commands/cmdsystem/commons.go → internal/cli/commands/cmdsystem/commons.go

@@ -2,7 +2,7 @@ package cmdsystem
 
 import (
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
 )
 
 var (

cli/internal/commands/cmdsystem/reset.go → internal/cli/commands/cmdsystem/reset.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/config"
-	"oss.amagi.com/slv/core/environments"
-	"oss.amagi.com/slv/core/input"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/config"
+	"oss.amagi.com/slv/internal/core/environments"
+	"oss.amagi.com/slv/internal/core/input"
 )
 
 func systemResetCommand() *cobra.Command {

cli/internal/commands/cmdvault/access.go → internal/cli/commands/cmdvault/access.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"oss.amagi.com/slv"
-	"oss.amagi.com/slv/cli/internal/commands/cmdenv"
-	"oss.amagi.com/slv/cli/internal/commands/utils"
-	"oss.amagi.com/slv/core/crypto"
+	"oss.amagi.com/slv/internal/cli/commands/cmdenv"
+	"oss.amagi.com/slv/internal/cli/commands/utils"
+	"oss.amagi.com/slv/internal/core/crypto"
+	"oss.amagi.com/slv/internal/core/secretkey"
 )
 
 func vaultAccessCommand() *cobra.Command {
@@ -37,7 +37,7 @@ func vaultAccessAddCommand() *cobra.Command {
 		Aliases: []string{"allow", "grant", "share"},
 		Short:   "Adds access to a vault for the given environments/public keys",
 		Run: func(cmd *cobra.Command, args []string) {
-			envSecretKey, err := slv.GetSecretKey()
+			envSecretKey, err := secretkey.Get()
 			if err != nil {
 				utils.ExitOnError(err)
 			}
@@ -106,7 +106,7 @@ func vaultAccessRemoveCommand() *cobra.Command {
 			pq, _ := cmd.Flags().GetBool(utils.QuantumSafeFlag.Name)
 			if err == nil {
 				var envSecretKey *crypto.SecretKey
-				if envSecretKey, err = slv.GetSecretKey(); err == nil {
+				if envSecretKey, err = secretkey.Get(); err == nil {
 					err = vault.Unlock(*envSecretKey)
 				}
 				if err == nil {

cli/internal/commands/cmdvault/commons.go → internal/cli/commands/cmdvault/commons.go

@@ -3,10 +3,10 @@ package cmdvault
 import (
 	"fmt"
 
-	"oss.amagi.com/slv/cli/internal/commands/cmdenv"
-	"oss.amagi.com/slv/core/crypto"
-	"oss.amagi.com/slv/core/environments"
-	"oss.amagi.com/slv/core/profiles"
+	"oss.amagi.com/slv/internal/cli/commands/cmdenv"
+	"oss.amagi.com/slv/internal/core/crypto"
+	"oss.amagi.com/slv/internal/core/environments"
+	"oss.amagi.com/slv/internal/core/profiles"
 )
 
 func getPublicKeys(pubKeyStrSlice, queries []string, self bool) (publicKeys []*crypto.PublicKey,