Add support for generating service tokens with write access

DopplerHQ · Oct 25, 2021 · 6d18c5e · 6d18c5e
1 parent b0ec5d2
commit 6d18c5e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/pkg/cmd/configs_tokens.go b/pkg/cmd/configs_tokens.go
@@ -103,6 +103,7 @@ func createConfigsTokens(cmd *cobra.Command, args []string) {
 	jsonFlag := utils.OutputJSON
 	plain := utils.GetBoolFlag(cmd, "plain")
 	copy := utils.GetBoolFlag(cmd, "copy")
+	access := cmd.Flag("access").Value.String()
 	localConfig := configuration.LocalConfig(cmd)
 
 	utils.RequireValue("token", localConfig.Token.Value)
@@ -122,7 +123,7 @@ func createConfigsTokens(cmd *cobra.Command, args []string) {
 		expireAt = time.Now().Add(maxAge)
 	}
 
-	configToken, err := http.CreateConfigServiceToken(localConfig.APIHost.Value, utils.GetBool(localConfig.VerifyTLS.Value, true), localConfig.Token.Value, localConfig.EnclaveProject.Value, localConfig.EnclaveConfig.Value, name, expireAt)
+	configToken, err := http.CreateConfigServiceToken(localConfig.APIHost.Value, utils.GetBool(localConfig.VerifyTLS.Value, true), localConfig.Token.Value, localConfig.EnclaveProject.Value, localConfig.EnclaveConfig.Value, name, expireAt, access)
 	if !err.IsNil() {
 		utils.HandleError(err.Unwrap(), err.Message)
 	}
@@ -184,6 +185,7 @@ func init() {
 	configsTokensCreateCmd.Flags().Bool("plain", false, "print only the token, without formatting")
 	configsTokensCreateCmd.Flags().Bool("copy", false, "copy the token to your clipboard")
 	configsTokensCreateCmd.Flags().Duration("max-age", 0, "token will expire after specified duration, (e.g. '3h', '15m')")
+	configsTokensCreateCmd.Flags().String("access", "read", "the token's access. one of [\"read\", \"read/write\"]")
 	configsTokensCmd.AddCommand(configsTokensCreateCmd)
 
 	configsTokensRevokeCmd.Flags().String("slug", "", "service token slug")

diff --git a/pkg/cmd/enclave_configs_tokens.go b/pkg/cmd/enclave_configs_tokens.go
@@ -75,6 +75,7 @@ func init() {
 	enclaveConfigsTokensCreateCmd.Flags().StringP("config", "c", "", "enclave config (e.g. dev)")
 	enclaveConfigsTokensCreateCmd.Flags().Bool("plain", false, "print only the token, without formatting")
 	enclaveConfigsTokensCreateCmd.Flags().Bool("copy", false, "copy the token to your clipboard")
+	enclaveConfigsTokensCreateCmd.Flags().String("access", "read", "the token's access. one of [\"read\", \"read/write\"]")
 	enclaveConfigsTokensCmd.AddCommand(enclaveConfigsTokensCreateCmd)
 
 	enclaveConfigsTokensRevokeCmd.Flags().String("slug", "", "service token slug")

diff --git a/pkg/http/api.go b/pkg/http/api.go
@@ -932,11 +932,12 @@ func GetConfigServiceTokens(host string, verifyTLS bool, apiKey string, project
 }
 
 // CreateConfigServiceToken create a config service token
-func CreateConfigServiceToken(host string, verifyTLS bool, apiKey string, project string, config string, name string, expireAt time.Time) (models.ConfigServiceToken, Error) {
+func CreateConfigServiceToken(host string, verifyTLS bool, apiKey string, project string, config string, name string, expireAt time.Time, access string) (models.ConfigServiceToken, Error) {
 	postBody := map[string]interface{}{"name": name}
 	if !expireAt.IsZero() {
 		postBody["expire_at"] = expireAt.Unix()
 	}
+	postBody["access"] = access
 
 	body, err := json.Marshal(postBody)
 	if err != nil {

diff --git a/pkg/models/api.go b/pkg/models/api.go
@@ -108,4 +108,5 @@ type ConfigServiceToken struct {
 	Project     string `json:"project"`
 	Environment string `json:"environment"`
 	Config      string `json:"config"`
+	Access      string `json:"access"`
 }
diff --git a/pkg/models/parse.go b/pkg/models/parse.go
@@ -284,6 +284,9 @@ func ParseConfigServiceToken(token map[string]interface{}) ConfigServiceToken {
 	if token["expires_at"] != nil {
 		parsedToken.ExpiresAt = token["expires_at"].(string)
 	}
+	if token["access"] != nil {
+		parsedToken.Access = token["access"].(string)
+	}
 
 	return parsedToken
 }
diff --git a/pkg/printer/enclave.go b/pkg/printer/enclave.go
@@ -325,9 +325,9 @@ func ConfigServiceTokensInfo(tokens []models.ConfigServiceToken, number int, jso
 
 	rows := [][]string{}
 	for _, token := range tokens {
-		rows = append(rows, []string{token.Name, token.Slug, token.Project, token.Environment, token.Config, token.CreatedAt, token.ExpiresAt})
+		rows = append(rows, []string{token.Name, token.Slug, token.Project, token.Environment, token.Config, token.CreatedAt, token.ExpiresAt, token.Access})
 	}
-	Table([]string{"name", "slug", "project", "environment", "config", "created at", "expires at"}, rows, TableOptions())
+	Table([]string{"name", "slug", "project", "environment", "config", "created at", "expires at", "access"}, rows, TableOptions())
 }
 
 // ConfigServiceTokenInfo print config service token info
@@ -358,6 +358,6 @@ func ConfigServiceToken(token models.ConfigServiceToken, jsonFlag bool, plain bo
 		return
 	}
 
-	rows := [][]string{{token.Name, token.Token, token.Slug, token.Project, token.Environment, token.Config, token.CreatedAt, token.ExpiresAt}}
-	Table([]string{"name", "token", "slug", "project", "environment", "config", "created at", "expires at"}, rows, TableOptions())
+	rows := [][]string{{token.Name, token.Token, token.Slug, token.Project, token.Environment, token.Config, token.CreatedAt, token.ExpiresAt, token.Access}}
+	Table([]string{"name", "token", "slug", "project", "environment", "config", "created at", "expires at", "access"}, rows, TableOptions())
 }