Skip to content

Commit 0f7e071

Browse files
authored
bug: Fixes --profile (#40)
* Removes config package and uses atlascli core config * Bump atlas-cli-core
1 parent 401ae09 commit 0f7e071

File tree

16 files changed

+20
-548
lines changed

16 files changed

+20
-548
lines changed

go.mod

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@ require (
88
github.com/Masterminds/semver/v3 v3.3.1
99
github.com/PaesslerAG/jsonpath v0.1.1
1010
github.com/go-test/deep v1.1.1
11-
github.com/golang-jwt/jwt/v4 v4.5.1
1211
github.com/golang/mock v1.6.0
1312
github.com/google/go-github/v61 v61.0.0
1413
github.com/google/uuid v1.6.0
1514
github.com/mongodb-forks/digest v1.1.0
1615
github.com/mongodb-labs/cobra2snooty v0.18.2
17-
github.com/mongodb/atlas-cli-core v0.0.0-20250102164103-49387c8ee633
16+
github.com/mongodb/atlas-cli-core v0.0.0-20250214162807-8f937b802e87
1817
github.com/mongodb/mongodb-atlas-kubernetes/v2 v2.7.0
1918
github.com/spf13/afero v1.12.0
2019
github.com/spf13/cobra v1.8.1
2120
github.com/spf13/pflag v1.0.5
22-
github.com/spf13/viper v1.19.0
2321
github.com/stretchr/testify v1.10.0
2422
github.com/tangzero/inflector v1.0.0
2523
go.mongodb.org/atlas v0.37.0
@@ -51,6 +49,7 @@ require (
5149
github.com/go-openapi/jsonreference v0.20.2 // indirect
5250
github.com/go-openapi/swag v0.23.0 // indirect
5351
github.com/gogo/protobuf v1.3.2 // indirect
52+
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
5453
github.com/golang/protobuf v1.5.4 // indirect
5554
github.com/google/gnostic-models v0.6.8 // indirect
5655
github.com/google/go-cmp v0.6.0 // indirect
@@ -76,6 +75,7 @@ require (
7675
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
7776
github.com/sourcegraph/conc v0.3.0 // indirect
7877
github.com/spf13/cast v1.6.0 // indirect
78+
github.com/spf13/viper v1.19.0 // indirect
7979
github.com/subosito/gotenv v1.6.0 // indirect
8080
github.com/x448/float16 v0.8.4 // indirect
8181
go.mongodb.org/atlas-sdk/v20231115008 v20231115008.5.0 // indirect
@@ -96,5 +96,4 @@ require (
9696
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
9797
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
9898
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
99-
10099
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ github.com/mongodb-forks/digest v1.1.0 h1:7eUdsR1BtqLv0mdNm4OXs6ddWvR4X2/OsLwdKk
116116
github.com/mongodb-forks/digest v1.1.0/go.mod h1:rb+EX8zotClD5Dj4NdgxnJXG9nwrlx3NWKJ8xttz1Dg=
117117
github.com/mongodb-labs/cobra2snooty v0.18.2 h1:qWpLCMWbQb5FSZ5ehiWN2URmieMJhQtQPxT0uhIK62A=
118118
github.com/mongodb-labs/cobra2snooty v0.18.2/go.mod h1:WnzqCFmx4f72Yj9dL/ulBUqcatfURGdKFf8DLT4h7zQ=
119-
github.com/mongodb/atlas-cli-core v0.0.0-20250102164103-49387c8ee633 h1:aAP61m3j8m2kKURFbauAu/Hk7nV+k8puGakS0M03tqk=
120-
github.com/mongodb/atlas-cli-core v0.0.0-20250102164103-49387c8ee633/go.mod h1:zeBvF+hvzhmHwvjT9QuLeGrKQlsY1YlQo8v25wWzQug=
119+
github.com/mongodb/atlas-cli-core v0.0.0-20250214162807-8f937b802e87 h1:Y9Gh8mkiHbDE7pXPWprLgNo0onWLtrQe25sTfqvlS5c=
120+
github.com/mongodb/atlas-cli-core v0.0.0-20250214162807-8f937b802e87/go.mod h1:zeBvF+hvzhmHwvjT9QuLeGrKQlsY1YlQo8v25wWzQug=
121121
github.com/mongodb/mongodb-atlas-kubernetes/v2 v2.7.0 h1:Fcj23AIwISOgQNjXqpvw3OA6FfKd+ZqwOzGxd9Sx/Gg=
122122
github.com/mongodb/mongodb-atlas-kubernetes/v2 v2.7.0/go.mod h1:aNJO0I6HBltZ+UHGoS+0mnOgLyLqnKhbVZ1UDiHe8kA=
123123
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=

internal/cli/kubernetes/config/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"context"
1919
"fmt"
2020

21+
"github.com/mongodb/atlas-cli-core/config"
2122
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/cli"
2223
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/cli/require"
23-
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/config"
2424
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/flag"
2525
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/kubernetes/operator"
2626
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/kubernetes/operator/crds"

internal/cli/kubernetes/kubernetes.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919

2020
coreConfig "github.com/mongodb/atlas-cli-core/config"
2121

22-
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/cli"
2322
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/cli/kubernetes/config"
2423
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/cli/kubernetes/operator"
2524
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/flag"
@@ -51,7 +50,7 @@ func Builder() *cobra.Command {
5150
if err != nil {
5251
return fmt.Errorf("failed to load Atlas CLI configuration: %v", err)
5352
}
54-
if err := cli.InitProfile(profile); err != nil {
53+
if err := coreConfig.InitProfile(profile); err != nil {
5554
return fmt.Errorf("Failed to initialise Atlas CLI profile: %v", err)
5655
}
5756

internal/cli/kubernetes/operator/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"fmt"
2020

2121
"github.com/google/go-github/v61/github"
22+
"github.com/mongodb/atlas-cli-core/config"
2223
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/cli"
2324
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/cli/require"
24-
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/config"
2525
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/flag"
2626
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/kubernetes"
2727
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/kubernetes/operator"

internal/cli/org_opts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package cli
1616

1717
import (
18-
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/config"
18+
"github.com/mongodb/atlas-cli-core/config"
1919
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/flag"
2020
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/usage"
2121
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/validate"

internal/cli/output_opts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"reflect"
2323
"strings"
2424

25-
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/config"
25+
"github.com/mongodb/atlas-cli-core/config"
2626
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/jsonpathwriter"
2727
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/jsonwriter"
2828
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/templatewriter"

internal/cli/profile.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

internal/cli/project_opts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package cli
1616

1717
import (
18-
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/config"
18+
"github.com/mongodb/atlas-cli-core/config"
1919
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/flag"
2020
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/usage"
2121
"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/validate"

0 commit comments

Comments
 (0)