Skip to content

Commit 6cc596a

Browse files
EricWittmannEricWittmann
authored
[REST API] Moved the artifactTypes endpoint slightly (#4339)
* Moved the artifactTypes REST endpoint slightly * updated hash in kiota lock file
1 parent c5be4b5 commit 6cc596a

File tree

7 files changed

+53
-53
lines changed

7 files changed

+53
-53
lines changed

‎app/src/test/java/io/apicurio/registry/rbac/AdminClientTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void deleteGlobalRule() throws Exception {
104104

105105
@Test
106106
public void listArtifactTypes() throws Exception {
107-
final List<ArtifactTypeInfo> artifactTypes = clientV3.admin().artifactTypes().get();
107+
final List<ArtifactTypeInfo> artifactTypes = clientV3.admin().config().artifactTypes().get();
108108

109109
assertTrue(artifactTypes.size() > 0);
110110
assertTrue(artifactTypes.stream().anyMatch(t -> t.getName().equals("OPENAPI")));

‎common/src/main/resources/META-INF/openapi.json

+30-30
Original file line numberDiff line numberDiff line change
@@ -59,36 +59,6 @@
5959
}
6060
]
6161
},
62-
"/admin/artifactTypes": {
63-
"summary": "The list of artifact types supported by this instance of Registry.",
64-
"get": {
65-
"tags": [
66-
"Artifact Type",
67-
"Admin"
68-
],
69-
"responses": {
70-
"200": {
71-
"content": {
72-
"application/json": {
73-
"schema": {
74-
"type": "array",
75-
"items": {
76-
"$ref": "#/components/schemas/ArtifactTypeInfo"
77-
}
78-
}
79-
}
80-
},
81-
"description": "The list of available artifact types."
82-
},
83-
"500": {
84-
"$ref": "#/components/responses/ServerError"
85-
}
86-
},
87-
"operationId": "listArtifactTypes",
88-
"summary": "List artifact types",
89-
"description": "Gets a list of all the configured artifact types.\n\nThis operation can fail for the following reasons:\n\n* A server error occurred (HTTP error `500`)\n"
90-
}
91-
},
9262
"/admin/rules": {
9363
"summary": "Manage the global rules that apply to all artifacts if not otherwise configured.",
9464
"get": {
@@ -3441,6 +3411,36 @@
34413411
"description": "Creates a new mapping between a user/principal and a role.\n\nThis operation can fail for the following reasons:\n\n* A server error occurred (HTTP error `500`)\n\n"
34423412
}
34433413
},
3414+
"/admin/config/artifactTypes": {
3415+
"summary": "The list of artifact types supported by this instance of Registry.",
3416+
"get": {
3417+
"tags": [
3418+
"Artifact Type",
3419+
"Admin"
3420+
],
3421+
"responses": {
3422+
"200": {
3423+
"content": {
3424+
"application/json": {
3425+
"schema": {
3426+
"type": "array",
3427+
"items": {
3428+
"$ref": "#/components/schemas/ArtifactTypeInfo"
3429+
}
3430+
}
3431+
}
3432+
},
3433+
"description": "The list of available artifact types."
3434+
},
3435+
"500": {
3436+
"$ref": "#/components/responses/ServerError"
3437+
}
3438+
},
3439+
"operationId": "listArtifactTypes",
3440+
"summary": "List artifact types",
3441+
"description": "Gets a list of all the configured artifact types.\n\nThis operation can fail for the following reasons:\n\n* A server error occurred (HTTP error `500`)\n"
3442+
}
3443+
},
34443444
"x-codegen-contextRoot": "/apis/registry/v3"
34453445
},
34463446
"components": {

‎go-sdk/pkg/registryclient-v3/admin/admin_request_builder.go

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ type AdminRequestBuilder struct {
99
i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.BaseRequestBuilder
1010
}
1111

12-
// ArtifactTypes the list of artifact types supported by this instance of Registry.
13-
func (m *AdminRequestBuilder) ArtifactTypes() *ArtifactTypesRequestBuilder {
14-
return NewArtifactTypesRequestBuilderInternal(m.BaseRequestBuilder.PathParameters, m.BaseRequestBuilder.RequestAdapter)
15-
}
16-
1712
// Config the config property
1813
func (m *AdminRequestBuilder) Config() *ConfigRequestBuilder {
1914
return NewConfigRequestBuilderInternal(m.BaseRequestBuilder.PathParameters, m.BaseRequestBuilder.RequestAdapter)

‎go-sdk/pkg/registryclient-v3/admin/artifact_types_request_builder.go ‎go-sdk/pkg/registryclient-v3/admin/config_artifact_types_request_builder.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,36 @@ import (
66
i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go"
77
)
88

9-
// ArtifactTypesRequestBuilder the list of artifact types supported by this instance of Registry.
10-
type ArtifactTypesRequestBuilder struct {
9+
// ConfigArtifactTypesRequestBuilder the list of artifact types supported by this instance of Registry.
10+
type ConfigArtifactTypesRequestBuilder struct {
1111
i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.BaseRequestBuilder
1212
}
1313

14-
// ArtifactTypesRequestBuilderGetRequestConfiguration configuration for the request such as headers, query parameters, and middleware options.
15-
type ArtifactTypesRequestBuilderGetRequestConfiguration struct {
14+
// ConfigArtifactTypesRequestBuilderGetRequestConfiguration configuration for the request such as headers, query parameters, and middleware options.
15+
type ConfigArtifactTypesRequestBuilderGetRequestConfiguration struct {
1616
// Request headers
1717
Headers *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestHeaders
1818
// Request options
1919
Options []i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestOption
2020
}
2121

22-
// NewArtifactTypesRequestBuilderInternal instantiates a new ArtifactTypesRequestBuilder and sets the default values.
23-
func NewArtifactTypesRequestBuilderInternal(pathParameters map[string]string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ArtifactTypesRequestBuilder {
24-
m := &ArtifactTypesRequestBuilder{
25-
BaseRequestBuilder: *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewBaseRequestBuilder(requestAdapter, "{+baseurl}/admin/artifactTypes", pathParameters),
22+
// NewConfigArtifactTypesRequestBuilderInternal instantiates a new ArtifactTypesRequestBuilder and sets the default values.
23+
func NewConfigArtifactTypesRequestBuilderInternal(pathParameters map[string]string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ConfigArtifactTypesRequestBuilder {
24+
m := &ConfigArtifactTypesRequestBuilder{
25+
BaseRequestBuilder: *i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewBaseRequestBuilder(requestAdapter, "{+baseurl}/admin/config/artifactTypes", pathParameters),
2626
}
2727
return m
2828
}
2929

30-
// NewArtifactTypesRequestBuilder instantiates a new ArtifactTypesRequestBuilder and sets the default values.
31-
func NewArtifactTypesRequestBuilder(rawUrl string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ArtifactTypesRequestBuilder {
30+
// NewConfigArtifactTypesRequestBuilder instantiates a new ArtifactTypesRequestBuilder and sets the default values.
31+
func NewConfigArtifactTypesRequestBuilder(rawUrl string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ConfigArtifactTypesRequestBuilder {
3232
urlParams := make(map[string]string)
3333
urlParams["request-raw-url"] = rawUrl
34-
return NewArtifactTypesRequestBuilderInternal(urlParams, requestAdapter)
34+
return NewConfigArtifactTypesRequestBuilderInternal(urlParams, requestAdapter)
3535
}
3636

3737
// Get gets a list of all the configured artifact types.This operation can fail for the following reasons:* A server error occurred (HTTP error `500`)
38-
func (m *ArtifactTypesRequestBuilder) Get(ctx context.Context, requestConfiguration *ArtifactTypesRequestBuilderGetRequestConfiguration) ([]i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.ArtifactTypeInfoable, error) {
38+
func (m *ConfigArtifactTypesRequestBuilder) Get(ctx context.Context, requestConfiguration *ConfigArtifactTypesRequestBuilderGetRequestConfiguration) ([]i00eb2e63d156923d00d8e86fe16b5d74daf30e363c9f185a8165cb42aa2f2c71.ArtifactTypeInfoable, error) {
3939
requestInfo, err := m.ToGetRequestInformation(ctx, requestConfiguration)
4040
if err != nil {
4141
return nil, err
@@ -57,7 +57,7 @@ func (m *ArtifactTypesRequestBuilder) Get(ctx context.Context, requestConfigurat
5757
}
5858

5959
// ToGetRequestInformation gets a list of all the configured artifact types.This operation can fail for the following reasons:* A server error occurred (HTTP error `500`)
60-
func (m *ArtifactTypesRequestBuilder) ToGetRequestInformation(ctx context.Context, requestConfiguration *ArtifactTypesRequestBuilderGetRequestConfiguration) (*i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestInformation, error) {
60+
func (m *ConfigArtifactTypesRequestBuilder) ToGetRequestInformation(ctx context.Context, requestConfiguration *ConfigArtifactTypesRequestBuilderGetRequestConfiguration) (*i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestInformation, error) {
6161
requestInfo := i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.NewRequestInformationWithMethodAndUrlTemplateAndPathParameters(i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.GET, m.BaseRequestBuilder.UrlTemplate, m.BaseRequestBuilder.PathParameters)
6262
if requestConfiguration != nil {
6363
requestInfo.Headers.AddAll(requestConfiguration.Headers)
@@ -68,6 +68,6 @@ func (m *ArtifactTypesRequestBuilder) ToGetRequestInformation(ctx context.Contex
6868
}
6969

7070
// WithUrl returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
71-
func (m *ArtifactTypesRequestBuilder) WithUrl(rawUrl string) *ArtifactTypesRequestBuilder {
72-
return NewArtifactTypesRequestBuilder(rawUrl, m.BaseRequestBuilder.RequestAdapter)
71+
func (m *ConfigArtifactTypesRequestBuilder) WithUrl(rawUrl string) *ConfigArtifactTypesRequestBuilder {
72+
return NewConfigArtifactTypesRequestBuilder(rawUrl, m.BaseRequestBuilder.RequestAdapter)
7373
}

‎go-sdk/pkg/registryclient-v3/admin/config_request_builder.go

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ type ConfigRequestBuilder struct {
99
i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.BaseRequestBuilder
1010
}
1111

12+
// ArtifactTypes the list of artifact types supported by this instance of Registry.
13+
func (m *ConfigRequestBuilder) ArtifactTypes() *ConfigArtifactTypesRequestBuilder {
14+
return NewConfigArtifactTypesRequestBuilderInternal(m.BaseRequestBuilder.PathParameters, m.BaseRequestBuilder.RequestAdapter)
15+
}
16+
1217
// NewConfigRequestBuilderInternal instantiates a new ConfigRequestBuilder and sets the default values.
1318
func NewConfigRequestBuilderInternal(pathParameters map[string]string, requestAdapter i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f.RequestAdapter) *ConfigRequestBuilder {
1419
m := &ConfigRequestBuilder{

‎go-sdk/pkg/registryclient-v3/kiota-lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"descriptionHash": "6E0EAAC52624FD30DE6E8C7BD3596D163AED7134AF0AA2A23B500BBEF8E1865A49B78CE31E003F8D322BBC3401CB9729FF951573506C0C27CF32C3746BAFAE1D",
2+
"descriptionHash": "F4EB75003DA95E186714B6B7D2ADAFB59D6B0E969B07C66B817F5FCD6C442C456D3E3AB699CBF073E1CE18295FCC5BD9CA6DDB4C2700F68E1FC4E3791681B018",
33
"descriptionLocation": "../../v3.json",
44
"lockFileVersion": "1.0.0",
55
"kiotaVersion": "1.10.1",

‎ui/ui-app/src/services/useAdminService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const getArtifactTypes = async (config: ConfigService, auth: AuthService): Promi
2323
const baseHref: string = config.artifactsUrl();
2424
const token: string | undefined = await auth.getToken();
2525
const options = createOptions(createHeaders(token));
26-
const endpoint: string = createEndpoint(baseHref, "/admin/artifactTypes");
26+
const endpoint: string = createEndpoint(baseHref, "/admin/config/artifactTypes");
2727
return httpGet<ArtifactTypeInfo[]>(endpoint, options);
2828
};
2929

0 commit comments

Comments
 (0)