Skip to content

Fix cortex cluster export command #2415

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
merged 2 commits into from
Jan 8, 2022
+13 −9
Merged

Fix cortex cluster export command #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
837a987
Fix panic on `cortex cluster export` command
RobertLucian Jan 7, 2022
477fb48
Use `Metadata` instead of `Spec` for correctness motive
RobertLucian Jan 7, 2022
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
12 changes: 8 additions & 4 deletions cli/cmd/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,12 +764,16 @@ var _clusterExportCmd = &cobra.Command{
exit.Error(err)
}

for _, apiResponse := range apisResponse {
specFilePath := filepath.Join(exportPath, apiResponse.Spec.Name+".yaml")
for _, api := range apisResponse {
apisWithSpec, err := cluster.GetAPI(operatorConfig, api.Metadata.Name)
if err != nil {
exit.Error(err)
}

fmt.Println(fmt.Sprintf("exporting %s to %s", apiResponse.Spec.Name, specFilePath))
specFilePath := filepath.Join(exportPath, api.Metadata.Name+".yaml")
fmt.Println(fmt.Sprintf("exporting %s to %s", api.Metadata.Name, specFilePath))

yamlBytes, err := yaml.Marshal(apiResponse.Spec.API.SubmittedAPISpec)
yamlBytes, err := yaml.Marshal(apisWithSpec[0].Spec.API.SubmittedAPISpec)
if err != nil {
exit.Error(err)
}
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,6 @@ func describeAPI(env cliconfig.Environment, apiName string) (string, error) {
case userconfig.AsyncAPIKind:
return asyncDescribeAPITable(apiRes, env)
default:
return "", errors.ErrorUnexpected(fmt.Sprintf("encountered unexpected kind %s for api %s", apiRes.Spec.Kind, apiRes.Spec.Name))
return "", errors.ErrorUnexpected(fmt.Sprintf("encountered unexpected kind %s for api %s", apiRes.Metadata.Kind, apiRes.Metadata.Name))
}
}
6 changes: 3 additions & 3 deletions cli/cmd/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ var _getCmd = &cobra.Command{
}

var jobTable string
if apisRes[0].Spec.Kind == userconfig.BatchAPIKind {
if apisRes[0].Metadata.Kind == userconfig.BatchAPIKind {
jobTable, err = getBatchJob(env, args[0], args[1])
} else {
jobTable, err = getTaskJob(env, args[0], args[1])
Expand Down Expand Up @@ -484,7 +484,7 @@ func getAPI(env cliconfig.Environment, apiName string) (string, error) {

apiRes := apisRes[0]

switch apiRes.Spec.Kind {
switch apiRes.Metadata.Kind {
case userconfig.RealtimeAPIKind:
return realtimeAPITable(apiRes, env)
case userconfig.AsyncAPIKind:
Expand All @@ -496,7 +496,7 @@ func getAPI(env cliconfig.Environment, apiName string) (string, error) {
case userconfig.TaskAPIKind:
return taskAPITable(apiRes), nil
default:
return "", errors.ErrorUnexpected(fmt.Sprintf("encountered unexpected kind %s for api %s", apiRes.Spec.Kind, apiRes.Spec.Name))
return "", errors.ErrorUnexpected(fmt.Sprintf("encountered unexpected kind %s for api %s", apiRes.Metadata.Kind, apiRes.Metadata.Name))
}
}

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/lib_traffic_splitters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func trafficSplitTable(trafficSplitter schema.APIResponse, env cliconfig.Environ
}
lastUpdated := time.Unix(apiRes.Metadata.LastUpdated, 0)

apiName := apiRes.Spec.Name
apiName := apiRes.Metadata.Name
if api.Shadow {
apiName += " (shadow)"
}
Expand Down