Skip to content

Commit

Permalink
Added version stage option
Browse files Browse the repository at this point in the history
  • Loading branch information
@yutachaos
yutachaos committed Nov 26, 2020
1 parent 0cfd652 commit 882767f
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 117 deletions.
4 changes: 3 additions & 1 deletion .golangci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ linters:
- testpackage
- lll
- errorlint
- gosimple
- gosimple
- gci
- golint
4 changes: 3 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
.PHONY: test

.PHONY: build
build:
go build -o secret-plan ./cmd/secret-plan/main.go

.PHONY: test
test:
go test -v ./...

.PHONY: fmt
fmt:
go fmt ./...
gofumpt -w -s ./..

.PHONY: lint
lint:
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ For secret value diff and save tool.(e.g aws secretsmanager)
- Value to be registered in Secret
- --version-id
- Specify the version-id to be acquired (optional).
- --version-stage
- Whether to specify version-stage(AWS only)
- --dry-run
- If your want to use diff only.
- --is-file
Expand Down
17 changes: 12 additions & 5 deletions cmd/secret-plan/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ func NewApp() *cli.App {
Usage: "Whether to specify version-id",
Required: false,
},
&cli.StringFlag{
Name: "version-stage",
Usage: "Whether to specify version-stage(AWS only)",
Required: false,
},
&cli.BoolFlag{
Name: "dry-run",
Usage: "dry run",
Expand Down Expand Up @@ -86,9 +91,9 @@ func Run(ctx *cli.Context) (err error) {

versionID := ctx.String("version-id")

sec := secret.NewSecret()
sec := secret.NewSecret(ctx)

currentSecret, secretExist, err := sec.Get(secretName, versionID)
currentSecret, err := sec.Get(secretName, versionID)
if err != nil {
return err
}
Expand All @@ -106,14 +111,14 @@ func Run(ctx *cli.Context) (err error) {
}

if approve() {
err := sec.Save(secretName, secretValue, secretExist)
err := sec.Save(secretName, secretValue)
if err != nil {
return err
}
} else {
fmt.Println("No Updated.")
}

fmt.Println("No Updated.")

return nil
}

Expand Down Expand Up @@ -143,6 +148,8 @@ func approve() bool {
for scanner.Scan() {
if scanner.Text() != "yes" {
return false
} else {
break
}
}

Expand Down
75 changes: 34 additions & 41 deletions internal/secret/aws.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@ package secret
import (
"fmt"

"github.com/urfave/cli/v2"

"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/secretsmanager"
"github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface"
)

type aws struct {
client secretsmanageriface.SecretsManagerAPI
client secretsmanageriface.SecretsManagerAPI
versionStage string
}

func newAws() *aws {
func newAws(ctx *cli.Context) *aws {
opts := session.Options{
SharedConfigState: session.SharedConfigEnable,
}
Expand All @@ -23,74 +26,64 @@ func newAws() *aws {
}

client := secretsmanager.New(sess)
versionStage := ctx.String("version-stage")

return &aws{
client: client,
client: client,
versionStage: versionStage,
}
}

func (a *aws) Get(name string, versionID string) (currentSecret string, secretExist bool, err error) {
func (a *aws) Get(name string, versionID string) (currentSecret string, err error) {
input := secretsmanager.GetSecretValueInput{
SecretId: &name,
}
if versionID != "" {
input.VersionId = &versionID
}

if a.versionStage != "" {
input.VersionStage = &a.versionStage
}

_, err = a.client.DescribeSecret(&secretsmanager.DescribeSecretInput{
SecretId: &name,
})

secretExist = true
if err != nil {
return "", err
}

var currentSecretValue string

secretValueOutput, err := a.client.GetSecretValue(&input)
if err != nil {
switch err.(type) {
case *secretsmanager.ResourceNotFoundException:
secretExist = false

break
default:
return "", secretExist, err
}
}

var currentSecretValue string

if secretExist {
secretValueOutput, err := a.client.GetSecretValue(&input)
if err != nil {
switch err.(type) {
case *secretsmanager.ResourceNotFoundException:
break
default:
return "", secretExist, err
}
} else {
currentSecretValue = *secretValueOutput.SecretString
return "", err
}
} else {
currentSecretValue = *secretValueOutput.SecretString
}

return currentSecretValue, secretExist, nil
return currentSecretValue, nil
}

func (a *aws) Save(name string, content string, secretExist bool) (err error) {
if secretExist {
output, err := a.client.PutSecretValue(&secretsmanager.PutSecretValueInput{SecretId: &name, SecretString: &content})
if err != nil {
return err
}

versionID := *output.VersionId
fmt.Printf("Update. Version: %s \n", versionID)
} else {
output, err := a.client.CreateSecret(&secretsmanager.CreateSecretInput{Name: &name, SecretString: &content})
if err != nil {
return err
}
func (a *aws) Save(name string, content string) (err error) {
input := secretsmanager.PutSecretValueInput{SecretId: &name, SecretString: &content}
if a.versionStage != "" {
input.VersionStages = []*string{&a.versionStage}
}

versionID := *output.VersionId
fmt.Printf("Create. Version: %s \n", versionID)
output, err := a.client.PutSecretValue(&input)
if err != nil {
return err
}

versionID := *output.VersionId
fmt.Printf("Update. Version: %s \n", versionID)

return nil
}
80 changes: 15 additions & 65 deletions internal/secret/aws_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ import (

type fakeAws struct {
secretsmanageriface.SecretsManagerAPI
fakeDescribeSecret func(*secretsmanager.DescribeSecretOutput, error) (*secretsmanager.DescribeSecretOutput, error)
fakeGetSecretValue func(*secretsmanager.GetSecretValueOutput, error) (*secretsmanager.GetSecretValueOutput, error)
fakePutSecretValue func(*secretsmanager.PutSecretValueOutput, error) (*secretsmanager.PutSecretValueOutput, error)
fakeGetCreateSecret func(*secretsmanager.CreateSecretOutput, error) (*secretsmanager.CreateSecretOutput, error)
fakeDescribeSecret func(*secretsmanager.DescribeSecretOutput, error) (*secretsmanager.DescribeSecretOutput, error)
fakeGetSecretValue func(*secretsmanager.GetSecretValueOutput, error) (*secretsmanager.GetSecretValueOutput, error)
fakePutSecretValue func(*secretsmanager.PutSecretValueOutput, error) (*secretsmanager.PutSecretValueOutput, error)
}

type describeSecretOutput struct {
Expand All @@ -33,11 +32,6 @@ type putSecretValueOutput struct {
err error
}

type createSecretOutput struct {
output *secretsmanager.CreateSecretOutput
err error
}

func (f fakeAws) DescribeSecret(*secretsmanager.DescribeSecretInput) (output *secretsmanager.DescribeSecretOutput, err error) {
return f.fakeDescribeSecret(output, err)
}
Expand All @@ -50,10 +44,6 @@ func (f fakeAws) PutSecretValue(*secretsmanager.PutSecretValueInput) (output *se
return f.fakePutSecretValue(output, err)
}

func (f fakeAws) CreateSecret(*secretsmanager.CreateSecretInput) (output *secretsmanager.CreateSecretOutput, err error) {
return f.fakeGetCreateSecret(output, err)
}

func TestGet(t *testing.T) {
t.Parallel()

Expand All @@ -62,7 +52,6 @@ func TestGet(t *testing.T) {
versionID string
mockDescribeSecret describeSecretOutput
mockGetSecretValue getSecretValueOutput
secretExist bool
err error
currentSecret string
}{
Expand All @@ -77,7 +66,6 @@ func TestGet(t *testing.T) {
output: &secretsmanager.GetSecretValueOutput{SecretString: toStrPtr("name2")},
err: nil,
},
secretExist: true,
err: nil,
currentSecret: "name2",
},
Expand All @@ -92,8 +80,7 @@ func TestGet(t *testing.T) {
output: &secretsmanager.GetSecretValueOutput{SecretString: toStrPtr("")},
err: nil,
},
secretExist: false,
err: nil,
err: &secretsmanager.ResourceNotFoundException{},
currentSecret: "",
},
{
Expand All @@ -107,7 +94,6 @@ func TestGet(t *testing.T) {
output: &secretsmanager.GetSecretValueOutput{SecretString: toStrPtr("")},
err: &secretsmanager.ResourceNotFoundException{},
},
secretExist: true,
err: nil,
currentSecret: "",
},
Expand All @@ -127,9 +113,8 @@ func TestGet(t *testing.T) {
},
},
}
currentSecret, secretExist, err := mockAws.Get(test.secretName, test.versionID)
currentSecret, err := mockAws.Get(test.secretName, test.versionID)

assert.Equal(t, test.secretExist, secretExist)
assert.Equal(t, test.err, err)
assert.Equal(t, test.currentSecret, currentSecret)
})
Expand All @@ -142,67 +127,35 @@ func TestSave(t *testing.T) {
tests := []struct {
secretName string
secretValue string
secretExist bool
mockPutSecretValue putSecretValueOutput
mockCreateSecret createSecretOutput
err error
stdout string
}{
{
secretName: "name1",
secretExist: true,
mockPutSecretValue: putSecretValueOutput{
output: &secretsmanager.PutSecretValueOutput{VersionId: toStrPtr("updated versionID1")},
err: nil,
},
mockCreateSecret: createSecretOutput{
output: &secretsmanager.CreateSecretOutput{},
err: nil,
},
err: nil,
stdout: "Update. Version: updated versionID1 \n",
},
{
secretName: "name2",
secretExist: true,
secretName: "name1",
mockPutSecretValue: putSecretValueOutput{
output: &secretsmanager.PutSecretValueOutput{VersionId: toStrPtr("updated versionID2")},
err: nil,
},
mockCreateSecret: createSecretOutput{
output: &secretsmanager.CreateSecretOutput{},
output: &secretsmanager.PutSecretValueOutput{VersionId: toStrPtr("versionID1")},
err: nil,
},
err: nil,
stdout: "Update. Version: updated versionID2 \n",
stdout: "Update. Version: versionID1 \n",
},
{
secretName: "name3",
secretExist: false,
secretName: "name2",
mockPutSecretValue: putSecretValueOutput{
output: &secretsmanager.PutSecretValueOutput{},
output: &secretsmanager.PutSecretValueOutput{VersionId: toStrPtr("versionID2")},
err: nil,
},
mockCreateSecret: createSecretOutput{
output: &secretsmanager.CreateSecretOutput{VersionId: toStrPtr("updated versionID3")},
err: nil,
},
stdout: "Create. Version: updated versionID3 \n",
err: nil,
stdout: "Update. Version: versionID2 \n",
},
{
secretName: "name3",
secretExist: false,
secretName: "name3",
mockPutSecretValue: putSecretValueOutput{
output: &secretsmanager.PutSecretValueOutput{},
err: nil,
},
mockCreateSecret: createSecretOutput{
output: &secretsmanager.CreateSecretOutput{VersionId: toStrPtr("updated versionID3")},
output: &secretsmanager.PutSecretValueOutput{VersionId: toStrPtr("versionID3")},
err: &secretsmanager.InvalidRequestException{},
},
stdout: "",
err: &secretsmanager.InvalidRequestException{},
err: &secretsmanager.InvalidRequestException{},
},
}

Expand All @@ -215,14 +168,11 @@ func TestSave(t *testing.T) {
fakePutSecretValue: func(*secretsmanager.PutSecretValueOutput, error) (*secretsmanager.PutSecretValueOutput, error) {
return test.mockPutSecretValue.output, test.mockPutSecretValue.err
},
fakeGetCreateSecret: func(*secretsmanager.CreateSecretOutput, error) (*secretsmanager.CreateSecretOutput, error) {
return test.mockCreateSecret.output, test.mockCreateSecret.err
},
},
}
var err error
stdout := capture.Stdout(func() {
err = mockAws.Save(test.secretName, test.secretValue, test.secretExist)
err = mockAws.Save(test.secretName, test.secretValue)
})
assert.Equal(t, test.err, err)
assert.Equal(t, test.stdout, stdout.String())
Expand Down
Loading

0 comments on commit 882767f

Please sign in to comment.