Skip to content

feat(service-account): enable credentials to be saved as secret #1575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wtrocki merged 1 commit into from
May 25, 2022
Merged

feat(service-account): enable credentials to be saved as secret #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion pkg/cmd/serviceaccount/svcaccountcmdutil/credentials/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package credentials
import (
"errors"
"fmt"
"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/color"
"io/ioutil"
"os"
"path/filepath"

"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/color"

"github.com/AlecAivazis/survey/v2"
"github.com/MakeNowJust/heredoc"
)
Expand All @@ -16,6 +17,7 @@ const (
EnvFormat = "env"
JSONFormat = "json"
PropertiesFormat = "properties"
SecretFormat = "secret"
)

// Templates
Expand All @@ -40,6 +42,18 @@ var (
"clientSecret":"%v",
"oauthTokenUrl":"%v"
}`)

templateSecret = heredoc.Doc(`
apiVersion: v1
kind: Secret
metadata:
name: service-account-credentials
type: Opaque
stringData:
RHOAS_SERVICE_ACCOUNT_CLIENT_ID: %v
RHOAS_SERVICE_ACCOUNT_CLIENT_SECRET: %v
RHOAS_SERVICE_ACCOUNT_OAUTH_TOKEN_URL: %v
`)
)

// Credentials is a type which represents the credentials
Expand All @@ -59,6 +73,8 @@ func GetDefaultPath(outputFormat string) (filePath string) {
filePath = "credentials.properties"
case JSONFormat:
filePath = "credentials.json"
case SecretFormat:
filePath = "credentials.yaml"
}

pwd, err := os.Getwd()
Expand Down Expand Up @@ -94,6 +110,8 @@ func getFileFormat(output string) (format string) {
format = templateProperties
case JSONFormat:
format = templateJSON
case SecretFormat:
format = templateSecret
}

return format
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/serviceaccount/svcaccountcmdutil/svcaccount_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

var (
CredentialsOutputFormats = []string{credentials.EnvFormat, credentials.JSONFormat, credentials.PropertiesFormat}
CredentialsOutputFormats = []string{credentials.EnvFormat, credentials.JSONFormat, credentials.PropertiesFormat, credentials.SecretFormat}
)

// Method fetches authentication details for providers
Expand Down