Skip to content

fix(cli): export not working with tags #5

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
varonix0 merged 3 commits into from
Jul 29, 2025
Merged

fix(cli): export not working with tags #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9a5179
fix(cli): export not working with tags
varonix0 Jul 29, 2025
c52bf06
fix: skip multiline
varonix0 Jul 29, 2025
8246b1c
Update secrets.go
varonix0 Jul 29, 2025
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
27 changes: 16 additions & 11 deletions packages/api/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package api

import "time"
import (
"time"

"github.com/Infisical/infisical-merge/packages/models"
)

// Stores info for login one
type LoginOneRequest struct {
Expand Down Expand Up @@ -593,16 +597,17 @@ type GetRawSecretsV3Request struct {

type GetRawSecretsV3Response struct {
Secrets []struct {
ID string `json:"_id"`
Version int `json:"version"`
Workspace string `json:"workspace"`
Type string `json:"type"`
Environment string `json:"environment"`
SecretKey string `json:"secretKey"`
SecretValue string `json:"secretValue"`
SecretComment string `json:"secretComment"`
SecretPath string `json:"secretPath"`
SkipMultilineEncoding bool `json:"skipMultilineEncoding"`
ID string `json:"_id"`
Version int `json:"version"`
Workspace string `json:"workspace"`
Type string `json:"type"`
Environment string `json:"environment"`
SecretKey string `json:"secretKey"`
SecretValue string `json:"secretValue"`
SecretComment string `json:"secretComment"`
SecretPath string `json:"secretPath"`
SkipMultilineEncoding bool `json:"skipMultilineEncoding"`
Tags []models.Tag `json:"tags"`
} `json:"secrets"`
Imports []ImportedRawSecretV3 `json:"imports"`
ETag string
Expand Down
14 changes: 2 additions & 12 deletions packages/cmd/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,12 +528,7 @@ func generateExampleEnv(cmd *cobra.Command, args []string) {

type TagsAndSecrets struct {
Secrets []models.SingleEnvironmentVariable
Tags []struct {
ID string `json:"_id"`
Name string `json:"name"`
Slug string `json:"slug"`
Workspace string `json:"workspace"`
}
Tags []models.Tag
}

// sort secrets by associated tags (most number of tags to least tags)
Expand All @@ -542,12 +537,7 @@ func generateExampleEnv(cmd *cobra.Command, args []string) {
})

for i, secret := range secrets {
filteredTag := []struct {
ID string "json:\"_id\""
Name string "json:\"name\""
Slug string "json:\"slug\""
Workspace string "json:\"workspace\""
}{}
filteredTag := []models.Tag{}

for _, secretTag := range secret.Tags {
_, exists := slugsToFilerBy[secretTag.Slug]
Expand Down
34 changes: 17 additions & 17 deletions packages/models/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ type LoggedInUser struct {
Domain string `json:"domain"`
}

type Tag struct {
ID string `json:"_id"`
Name string `json:"name"`
Slug string `json:"slug"`
Color string `json:"color"`
}

type SingleEnvironmentVariable struct {
Key string `json:"key"`
WorkspaceId string `json:"workspace"`
Value string `json:"value"`
Type string `json:"type"`
ID string `json:"_id"`
SecretPath string `json:"secretPath"`
Tags []struct {
ID string `json:"_id"`
Name string `json:"name"`
Slug string `json:"slug"`
Workspace string `json:"workspace"`
} `json:"tags"`
Comment string `json:"comment"`
Etag string `json:"Etag"`

// Deprecated: SkipMultilineEncoding is deprecated. Use IsMultilineEncodingEnabled() instead.
SkipMultilineEncoding bool `json:"skipMultilineEncoding"`
Key string `json:"key"`
WorkspaceId string `json:"workspace"`
Value string `json:"value"`
Type string `json:"type"`
ID string `json:"_id"`
SecretPath string `json:"secretPath"`
Tags []Tag `json:"tags"`
Comment string `json:"comment"`
Etag string `json:"Etag"`
SkipMultilineEncoding bool `json:"skipMultilineEncoding"`
}

// TLDR; Why you shouldn't depend on "SkipMultilineEncoding" and instead use this method
Expand Down
4 changes: 2 additions & 2 deletions packages/util/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func GetPlainTextSecretsViaServiceToken(fullServiceToken string, environment str
plainTextSecrets := []models.SingleEnvironmentVariable{}

for _, secret := range rawSecrets.Secrets {
plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SkipMultilineEncoding: secret.SkipMultilineEncoding})
plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SkipMultilineEncoding: secret.SkipMultilineEncoding, Tags: secret.Tags})
}

if includeImports {
Expand Down Expand Up @@ -111,7 +111,7 @@ func GetPlainTextSecretsV3(accessToken string, workspaceId string, environmentNa
plainTextSecrets := []models.SingleEnvironmentVariable{}

for _, secret := range rawSecrets.Secrets {
plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SecretPath: secret.SecretPath, SkipMultilineEncoding: secret.SkipMultilineEncoding})
plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SecretPath: secret.SecretPath, SkipMultilineEncoding: secret.SkipMultilineEncoding, Tags: secret.Tags})
}

if includeImports {
Expand Down