awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 11:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch k8-operator to secrets v2api

Browse Source
This commit is contained in:
Maidul Islam
2023-01-15 23:12:11 -08:00
parent da3742f600
commit 3ba636f300
4 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
k8-operator/config/samples/deployment.yaml
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment-2 name: nginx-deployment
labels: labels:
app: nginx app: nginx
annotations: annotations:
k8-operator/packages/api/api.go
+12 -12
View File
@@ -21,7 +21,7 @@ func CallGetEncryptedWorkspaceKey(httpClient *resty.Client, request GetEncrypted
return GetEncryptedWorkspaceKeyResponse{}, fmt.Errorf("CallGetEncryptedWorkspaceKey: Unable to complete api request [err=%s]", err) return GetEncryptedWorkspaceKeyResponse{}, fmt.Errorf("CallGetEncryptedWorkspaceKey: Unable to complete api request [err=%s]", err)
} }
if response.StatusCode() > 299 { if response.IsError() {
return GetEncryptedWorkspaceKeyResponse{}, fmt.Errorf("CallGetEncryptedWorkspaceKey: Unsuccessful response: [response=%s]", response) return GetEncryptedWorkspaceKeyResponse{}, fmt.Errorf("CallGetEncryptedWorkspaceKey: Unsuccessful response: [response=%s]", response)
} }
@@ -48,18 +48,18 @@ func CallGetServiceTokenDetailsV2(httpClient *resty.Client) (GetServiceTokenDeta
} }
func CallGetSecretsV2(httpClient *resty.Client, request GetEncryptedSecretsV2Request) (GetEncryptedSecretsV2Response, error) { func CallGetSecretsV2(httpClient *resty.Client, request GetEncryptedSecretsV2Request) (GetEncryptedSecretsV2Response, error) {
var secretsResponse GetEncryptedSecretsV2Response = GetEncryptedSecretsV2Response{} var encryptedSecretsResponse GetEncryptedSecretsV2Response
createHttpRequest := httpClient. createHttpRequest := httpClient.
R(). R().
SetResult(&secretsResponse.Secrets). SetQueryParam("environment", request.Environment).
SetQueryParam("environment", request.EnvironmentName). SetQueryParam("workspaceId", request.WorkspaceId).
SetResult(&encryptedSecretsResponse).
SetHeader("User-Agent", USER_AGENT_NAME) SetHeader("User-Agent", USER_AGENT_NAME)
if request.ETag != "" { createHttpRequest.SetHeader("If-None-Match", request.ETag)
createHttpRequest.SetHeader("If-None-Match", request.ETag)
} response, err := createHttpRequest.Get(fmt.Sprintf("%v/v2/secrets", API_HOST_URL))
response, err := createHttpRequest.Get(fmt.Sprintf("%v/v2/secret/workspace/%v", API_HOST_URL, request.WorkspaceId))
if err != nil { if err != nil {
return GetEncryptedSecretsV2Response{}, fmt.Errorf("CallGetSecretsV2: Unable to complete api request [err=%s]", err) return GetEncryptedSecretsV2Response{}, fmt.Errorf("CallGetSecretsV2: Unable to complete api request [err=%s]", err)
} }
@@ -69,12 +69,12 @@ func CallGetSecretsV2(httpClient *resty.Client, request GetEncryptedSecretsV2Req
} }
if response.StatusCode() == 304 { if response.StatusCode() == 304 {
secretsResponse.Modified = false encryptedSecretsResponse.Modified = false
} else { } else {
secretsResponse.Modified = true encryptedSecretsResponse.Modified = true
} }
secretsResponse.ETag = response.Header().Get("etag") encryptedSecretsResponse.ETag = response.Header().Get("etag")
return secretsResponse, nil return encryptedSecretsResponse, nil
} }
k8-operator/packages/api/models.go
+18 -26
View File
@@ -29,35 +29,28 @@ type GetEncryptedWorkspaceKeyResponse struct {
} }
type GetEncryptedSecretsV2Request struct { type GetEncryptedSecretsV2Request struct {
EnvironmentName string `json:"environmentName"` Environment string `json:"environment"`
WorkspaceId string `json:"workspaceId"` WorkspaceId string `json:"workspaceId"`
ETag string `json:"etag,omitempty"` ETag string `json:"etag,omitempty"`
} }
type GetEncryptedSecretsV2Response struct { type GetEncryptedSecretsV2Response struct {
Secrets []struct { Secrets []struct {
ID string `json:"_id"` ID string `json:"_id"`
Version int `json:"version"` Version int `json:"version"`
Workspace string `json:"workspace"` Workspace string `json:"workspace"`
Type string `json:"type"` Type string `json:"type"`
Environment string `json:"environment"` Environment string `json:"environment"`
SecretKeyCiphertext string `json:"secretKeyCiphertext"` SecretKeyCiphertext string `json:"secretKeyCiphertext"`
SecretKeyIV string `json:"secretKeyIV"` SecretKeyIV string `json:"secretKeyIV"`
SecretKeyTag string `json:"secretKeyTag"` SecretKeyTag string `json:"secretKeyTag"`
SecretKeyHash string `json:"secretKeyHash"` SecretValueCiphertext string `json:"secretValueCiphertext"`
SecretValueCiphertext string `json:"secretValueCiphertext"` SecretValueIV string `json:"secretValueIV"`
SecretValueIV string `json:"secretValueIV"` SecretValueTag string `json:"secretValueTag"`
SecretValueTag string `json:"secretValueTag"` CreatedAt time.Time `json:"createdAt"`
SecretValueHash string `json:"secretValueHash"` UpdatedAt time.Time `json:"updatedAt"`
SecretCommentCiphertext string `json:"secretCommentCiphertext"` User string `json:"user,omitempty"`
SecretCommentIV string `json:"secretCommentIV"` } `json:"secrets"`
SecretCommentTag string `json:"secretCommentTag"`
SecretCommentHash string `json:"secretCommentHash"`
V int `json:"__v"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
User string `json:"user,omitempty"`
}
Modified bool `json:"modified,omitempty"` Modified bool `json:"modified,omitempty"`
ETag string `json:"ETag,omitempty"` ETag string `json:"ETag,omitempty"`
@@ -68,7 +61,6 @@ type GetServiceTokenDetailsResponse struct {
Name string `json:"name"` Name string `json:"name"`
Workspace string `json:"workspace"` Workspace string `json:"workspace"`
Environment string `json:"environment"` Environment string `json:"environment"`
User string `json:"user"`
EncryptedKey string `json:"encryptedKey"` EncryptedKey string `json:"encryptedKey"`
Iv string `json:"iv"` Iv string `json:"iv"`
Tag string `json:"tag"` Tag string `json:"tag"`
k8-operator/packages/util/secrets.go
+4 -3
View File
@@ -63,6 +63,7 @@ func GetPlainTextSecretsViaServiceToken(fullServiceToken string, etag string) ([
serviceToken := fmt.Sprintf("%v.%v.%v", serviceTokenParts[0], serviceTokenParts[1], serviceTokenParts[2]) serviceToken := fmt.Sprintf("%v.%v.%v", serviceTokenParts[0], serviceTokenParts[1], serviceTokenParts[2])
httpClient := resty.New() httpClient := resty.New()
httpClient.SetAuthToken(serviceToken). httpClient.SetAuthToken(serviceToken).
SetHeader("Accept", "application/json") SetHeader("Accept", "application/json")
@@ -72,9 +73,9 @@ func GetPlainTextSecretsViaServiceToken(fullServiceToken string, etag string) ([
} }
encryptedSecretsResponse, err := api.CallGetSecretsV2(httpClient, api.GetEncryptedSecretsV2Request{ encryptedSecretsResponse, err := api.CallGetSecretsV2(httpClient, api.GetEncryptedSecretsV2Request{
WorkspaceId: serviceTokenDetails.Workspace, WorkspaceId: serviceTokenDetails.Workspace,
EnvironmentName: serviceTokenDetails.Environment, Environment: serviceTokenDetails.Environment,
ETag: etag, ETag: etag,
}) })
if err != nil { if err != nil {