Skip to content
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.

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

Add openApiSpec and odataSpec field for CSC and SC in ui-api-layer #2962

Merged
merged 12 commits into from Mar 7, 2019

Conversation

magicmatatjahu
Copy link
Contributor

@magicmatatjahu magicmatatjahu commented Mar 4, 2019

Description

Changes proposed in this pull request:

  • Add openApiSpec and odataSpec field for CSC and SC in ui-api-layer
  • Add relevant tests for new fields.
  • Add deprecated label for apiSpec field.
  • Add new fields in CSC and SC in acceptance tests of ui-api-layer.

Related Pr(s)
#2967

Related issue(s)
Resolves https://github.com/kyma-project/console/issues/561

@magicmatatjahu magicmatatjahu added kind/feature Categorizes issue or PR as related to a new feature. area/documentation Issues or PRs related to documentation area/service-management Issues or PRs related to service management area/busola Related to all activities around the Busola UI and all its views labels Mar 4, 2019
@magicmatatjahu magicmatatjahu self-assigned this Mar 5, 2019
Copy link
Contributor

@pkosiec pkosiec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌 Looks very good!

Please prepare a PR with temporary images where you will run integration tests.

@@ -1,5 +1,4 @@
// Code generated by mockery v1.0.0. DO NOT EDIT.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please reset these formatting changes in mocks

type handler func(filename string) (interface{}, bool, error)
const (
ApiSpecField = "apiSpec"
OpenApiSpecField = "openApiSpec"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename OpenApi to OpenAPI everywhere

AsyncApiSpec(id string) (*AsyncApiSpec, bool, error)
Content(id string) (*Content, bool, error)
NotificationChannel(stop <-chan struct{}) <-chan notification
}

type handler func(filename string) (interface{}, bool, error)
const (
ApiSpecField = "apiSpec"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Api -> API

@@ -60,6 +64,70 @@ func (o *ApiSpec) UnmarshalJSON(jsonData []byte) error {
return nil
}

type OpenApiSpec struct {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Api -> API

@magicmatatjahu
Copy link
Contributor Author

/retest

@magicmatatjahu magicmatatjahu merged commit b426d54 into kyma-project:master Mar 7, 2019
@magicmatatjahu magicmatatjahu deleted the openapi-odata-spec branch March 7, 2019 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/busola Related to all activities around the Busola UI and all its views area/documentation Issues or PRs related to documentation area/service-management Issues or PRs related to service management kind/feature Categorizes issue or PR as related to a new feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants