Skip to content

Commit 2ef1046

Browse files
committed
feat: #160 Adds support of ClienOpts in all remaining commads
Signed-off-by: Harsh4902 <[email protected]>
1 parent 1e98293 commit 2ef1046

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed

cmd/importURL.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ func NewImportURLCommand(globalClientOpts *connectors.ClientOptions) *cobra.Comm
4545
config.CaCertPaths = globalClientOpts.CaCertPaths
4646
config.Verbose = globalClientOpts.Verbose
4747

48+
<<<<<<< HEAD
4849
var mc connectors.MicrocksClient
4950

5051
if globalClientOpts.ServerAddr != "" && globalClientOpts.ClientId != "" && globalClientOpts.ClientSecret != "" {
@@ -95,6 +96,29 @@ func NewImportURLCommand(globalClientOpts *connectors.ClientOptions) *cobra.Comm
9596
return
9697
}
9798
}
99+
=======
100+
localConfig, err := config.ReadLocalConfig(globalClientOpts.ConfigPath)
101+
if err != nil {
102+
fmt.Println(err)
103+
return
104+
}
105+
106+
if localConfig == nil {
107+
fmt.Println("Please login to perform opertion...")
108+
return
109+
}
110+
111+
if globalClientOpts.Context == "" {
112+
globalClientOpts.Context = localConfig.CurrentContext
113+
}
114+
115+
mc, err := connectors.NewClient(*globalClientOpts)
116+
if err != nil {
117+
fmt.Printf("error %v", err)
118+
return
119+
}
120+
121+
>>>>>>> df054bc (feat: #160 Adds support of ClienOpts in all remaining commads)
98122
sepSpecificationFiles := strings.Split(specificationFiles, ",")
99123
for _, f := range sepSpecificationFiles {
100124
mainArtifact := true

cmd/test.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ func NewTestCommand(globalClientOpts *connectors.ClientOptions) *cobra.Command {
9696
waitForMilliseconds = waitForMilliseconds * 60 * 1000
9797
}
9898

99+
<<<<<<< HEAD
99100
var mc connectors.MicrocksClient
100101
var serverAddr string
101102

@@ -155,6 +156,34 @@ func NewTestCommand(globalClientOpts *connectors.ClientOptions) *cobra.Command {
155156
serverAddr = ctx.Server.Server
156157
}
157158

159+
=======
160+
localConfig, err := config.ReadLocalConfig(globalClientOpts.ConfigPath)
161+
if err != nil {
162+
fmt.Println(err)
163+
return
164+
}
165+
166+
if localConfig == nil {
167+
fmt.Println("Please login to perform opertion...")
168+
return
169+
}
170+
171+
if globalClientOpts.Context == "" {
172+
globalClientOpts.Context = localConfig.CurrentContext
173+
}
174+
175+
mc, err := connectors.NewClient(*globalClientOpts)
176+
if err != nil {
177+
fmt.Printf("error %v", err)
178+
return
179+
}
180+
181+
ctx, err := localConfig.ResolveContext(globalClientOpts.Context)
182+
errors.CheckError(err)
183+
184+
serverAddr := ctx.Server.Server
185+
186+
>>>>>>> df054bc (feat: #160 Adds support of ClienOpts in all remaining commads)
158187
var testResultID string
159188
testResultID, err := mc.CreateTestResult(serviceRef, testEndpoint, runnerType, secretName, waitForMilliseconds, filteredOperations, operationsHeaders, oAuth2Context)
160189
if err != nil {

0 commit comments

Comments
 (0)