Skip to content

Commit eb693d4

Browse files
whdalsrntwhdalsrnt
authored
Merge pull request #501 from whdalsrnt/master
refactor: refactor config APIs
2 parents c3c02c2 + acb893e commit eb693d4

File tree

4 files changed

+201
-106
lines changed

4 files changed

+201
-106
lines changed

‎proto/spaceone/api/config/v1/domain_config.proto

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// DomainConfig API which configure environments for domain
21
syntax = "proto3";
32

43
package spaceone.api.config.v1;

‎proto/spaceone/api/config/v1/public_config.proto

+61-104
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// DomainConfig API which configure environments for domain
21
syntax = "proto3";
32

43
package spaceone.api.config.v1;
@@ -12,126 +11,84 @@ import "spaceone/api/core/v2/query.proto";
1211

1312

1413
service PublicConfig {
15-
rpc create (CreatePublicConfigRequest) returns (PublicConfigInfo) {
16-
option (google.api.http) = {
17-
post: "/config/v1/public-config/create"
18-
body: "*"
19-
};
20-
}
21-
rpc update (UpdatePublicConfigRequest) returns (PublicConfigInfo) {
22-
option (google.api.http) = {
23-
post: "/config/v1/public-config/update"
24-
body: "*"
25-
};
26-
}
27-
28-
rpc delete (PublicConfigRequest) returns (google.protobuf.Empty) {
29-
option (google.api.http) = {
30-
post: "/config/v1/public-config/delete"
31-
body: "*"
32-
};
33-
}
34-
rpc get (PublicConfigSearchQuery) returns (PublicConfigInfo) {
35-
option (google.api.http) = {
36-
post: "/config/v1/public-config/get"
37-
body: "*"
38-
};
39-
}
40-
41-
// This API for retrieving domain scoped configs that are accessible to users.
42-
rpc get_accessible_configs (PublicConfigSearchQuery) returns (PublicConfigsInfo) {
43-
option (google.api.http) = {
44-
post: "/config/v1/public-config/get-accessible-configs"
45-
body: "*"
46-
};
47-
}
48-
49-
rpc list (PublicConfigSearchQuery) returns (PublicConfigsInfo) {
50-
option (google.api.http) = {
51-
post: "/config/v1/public-config/list"
52-
body: "*"
53-
};
54-
}
55-
rpc stat (PublicConfigStatQuery) returns (google.protobuf.Struct) {
56-
option (google.api.http) = {
57-
post: "/config/v1/public-config/stat"
58-
body: "*"
59-
};
60-
}
61-
}
62-
63-
64-
message CreatePublicConfigRequest {
65-
enum ResourceGroup {
66-
RESOURCE_GROUP_NONE = 0;
67-
DOMAIN = 1;
68-
WORKSPACE = 2;
69-
PROJECT = 3;
70-
}
71-
72-
string name = 1;
73-
google.protobuf.Struct data = 2;
74-
// +optional
75-
google.protobuf.Struct tags = 3;
76-
ResourceGroup resource_group = 20;
77-
// +optional
78-
string workspace_id = 21;
79-
// +optional
80-
string project_id = 22;
14+
rpc create (SetPublicConfigRequest) returns (PublicConfigInfo) {
15+
option (google.api.http) = {
16+
post: "/config/v1/public-config/create"
17+
body: "*"
18+
};
19+
}
20+
rpc update (SetPublicConfigRequest) returns (PublicConfigInfo) {
21+
option (google.api.http) = {
22+
post: "/config/v1/public-config/update"
23+
body: "*"
24+
};
25+
}
26+
rpc set (SetPublicConfigRequest) returns (PublicConfigInfo) {
27+
option (google.api.http) = {
28+
post: "/config/v1/public-config/set"
29+
body: "*"
30+
};
31+
}
32+
rpc delete (PublicConfigRequest) returns (google.protobuf.Empty) {
33+
option (google.api.http) = {
34+
post: "/config/v1/public-config/delete"
35+
body: "*"
36+
};
37+
}
38+
rpc get (PublicConfigRequest) returns (PublicConfigInfo) {
39+
option (google.api.http) = {
40+
post: "/config/v1/public-config/get"
41+
body: "*"
42+
};
43+
}
44+
rpc list (PublicConfigSearchQuery) returns (PublicConfigsInfo) {
45+
option (google.api.http) = {
46+
post: "/config/v1/public-config/list"
47+
body: "*"
48+
};
49+
}
50+
rpc stat (PublicConfigStatQuery) returns (google.protobuf.Struct) {
51+
option (google.api.http) = {
52+
post: "/config/v1/public-config/stat"
53+
body: "*"
54+
};
55+
}
8156
}
8257

83-
message UpdatePublicConfigRequest {
84-
string name = 1;
85-
google.protobuf.Struct data = 2;
86-
// +optional
87-
google.protobuf.Struct tags = 3;
88-
// +optional
89-
string workspace_id = 21;
90-
// +optional
91-
string project_id = 22;
92-
58+
message SetPublicConfigRequest {
59+
string name = 1;
60+
google.protobuf.Struct data = 2;
61+
// +optional
62+
google.protobuf.Struct tags = 3;
9363
}
9464

9565
message PublicConfigRequest {
96-
string name = 1;
97-
// +optional
98-
string workspace_id = 21;
99-
// +optional
100-
string project_id = 22;
66+
string name = 1;
10167
}
10268

10369
message PublicConfigSearchQuery {
104-
// +optional
105-
spaceone.api.core.v2.Query query = 1;
106-
// +optional
107-
string name = 2;
70+
// +optional
71+
spaceone.api.core.v2.Query query = 1;
72+
// +optional
73+
string name = 2;
10874
}
10975

11076
message PublicConfigInfo {
111-
enum ResourceGroup {
112-
RESOURCE_GROUP_NONE = 0;
113-
DOMAIN = 1;
114-
WORKSPACE = 2;
115-
PROJECT = 3;
116-
}
77+
string name = 1;
78+
google.protobuf.Struct data = 2;
79+
google.protobuf.Struct tags = 3;
11780

118-
string name = 1;
119-
google.protobuf.Struct data = 2;
120-
google.protobuf.Struct tags = 3;
121-
ResourceGroup resource_group = 20;
122-
string domain_id = 21;
123-
string workspace_id = 22;
124-
string project_id = 23;
81+
string domain_id = 21;
12582

126-
string created_at = 31;
127-
string updated_at = 32;
83+
string created_at = 31;
84+
string updated_at = 32;
12885
}
12986

13087
message PublicConfigsInfo {
131-
repeated PublicConfigInfo results = 1;
132-
int32 total_count = 2;
88+
repeated PublicConfigInfo results = 1;
89+
int32 total_count = 2;
13390
}
13491

13592
message PublicConfigStatQuery {
136-
spaceone.api.core.v2.StatisticsQuery query = 1;
93+
spaceone.api.core.v2.StatisticsQuery query = 1;
13794
}

‎proto/spaceone/api/config/v1/shared_config.proto

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
syntax = "proto3";
2+
3+
package spaceone.api.config.v1;
4+
5+
option go_package = "github.com/cloudforet-io/api/dist/go/spaceone/api/config/v1";
6+
7+
import "google/protobuf/empty.proto";
8+
import "google/protobuf/struct.proto";
9+
import "google/api/annotations.proto";
10+
import "spaceone/api/core/v2/query.proto";
11+
12+
13+
service SharedConfig {
14+
rpc create (CreateSharedConfigRequest) returns (SharedConfigInfo) {
15+
option (google.api.http) = {
16+
post: "/config/v1/shared-config/create"
17+
body: "*"
18+
};
19+
}
20+
rpc update (UpdateSharedConfigRequest) returns (SharedConfigInfo) {
21+
option (google.api.http) = {
22+
post: "/config/v1/shared-config/update"
23+
body: "*"
24+
};
25+
}
26+
rpc set (SetSharedConfigRequest) returns (SharedConfigInfo) {
27+
option (google.api.http) = {
28+
post: "/config/v1/shared-config/set"
29+
body: "*"
30+
};
31+
}
32+
rpc delete (SharedConfigRequest) returns (google.protobuf.Empty) {
33+
option (google.api.http) = {
34+
post: "/config/v1/shared-config/delete"
35+
body: "*"
36+
};
37+
}
38+
rpc get (SharedConfigSearchQuery) returns (SharedConfigInfo) {
39+
option (google.api.http) = {
40+
post: "/config/v1/shared-config/get"
41+
body: "*"
42+
};
43+
}
44+
45+
rpc list (SharedConfigSearchQuery) returns (SharedConfigsInfo) {
46+
option (google.api.http) = {
47+
post: "/config/v1/shared-config/list"
48+
body: "*"
49+
};
50+
}
51+
rpc stat (SharedConfigStatQuery) returns (google.protobuf.Struct) {
52+
option (google.api.http) = {
53+
post: "/config/v1/shared-config/stat"
54+
body: "*"
55+
};
56+
}
57+
}
58+
59+
60+
message CreateSharedConfigRequest {
61+
enum ResourceGroup {
62+
RESOURCE_GROUP_NONE = 0;
63+
DOMAIN = 1;
64+
WORKSPACE = 2;
65+
PROJECT = 3;
66+
}
67+
68+
string name = 1;
69+
google.protobuf.Struct data = 2;
70+
// +optional
71+
google.protobuf.Struct tags = 3;
72+
ResourceGroup resource_group = 20;
73+
// +optional
74+
string workspace_id = 21;
75+
// +optional
76+
string project_id = 22;
77+
}
78+
79+
message UpdateSharedConfigRequest {
80+
string name = 1;
81+
google.protobuf.Struct data = 2;
82+
// +optional
83+
google.protobuf.Struct tags = 3;
84+
// +optional
85+
string workspace_id = 21;
86+
// +optional
87+
string project_id = 22;
88+
}
89+
90+
message SetSharedConfigRequest {
91+
string name = 1;
92+
google.protobuf.Struct data = 2;
93+
// +optional
94+
google.protobuf.Struct tags = 3;
95+
}
96+
97+
message SharedConfigRequest {
98+
string name = 1;
99+
// +optional
100+
string workspace_id = 21;
101+
// +optional
102+
string project_id = 22;
103+
}
104+
105+
message SharedConfigSearchQuery {
106+
// +optional
107+
spaceone.api.core.v2.Query query = 1;
108+
// +optional
109+
string name = 2;
110+
}
111+
112+
message SharedConfigInfo {
113+
enum ResourceGroup {
114+
RESOURCE_GROUP_NONE = 0;
115+
DOMAIN = 1;
116+
WORKSPACE = 2;
117+
PROJECT = 3;
118+
}
119+
120+
string name = 1;
121+
google.protobuf.Struct data = 2;
122+
google.protobuf.Struct tags = 3;
123+
124+
ResourceGroup resource_group = 20;
125+
string domain_id = 21;
126+
string workspace_id = 22;
127+
string project_id = 23;
128+
129+
string created_at = 31;
130+
string updated_at = 32;
131+
}
132+
133+
message SharedConfigsInfo {
134+
repeated SharedConfigInfo results = 1;
135+
int32 total_count = 2;
136+
}
137+
138+
message SharedConfigStatQuery {
139+
spaceone.api.core.v2.StatisticsQuery query = 1;
140+
}

‎proto/spaceone/api/config/v1/user_config.proto

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// UserConfig API which configure environments for user
21
syntax = "proto3";
32

43
package spaceone.api.config.v1;

0 commit comments

Comments
 (0)