Skip to content

Commit ccd9e02

Browse files
brykbryk
committed
Merge pull request #370 from bryk/v1-api
Scope current API as v1 API.
2 parents ffcff5f + a4851da commit ccd9e02

19 files changed

+45
-38
lines changed

‎src/app/backend/apihandler.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
6161

6262
deployWs := new(restful.WebService)
6363
deployWs.Filter(wsLogger)
64-
deployWs.Path("/api/appdeployments").
64+
deployWs.Path("/api/v1/appdeployments").
6565
Consumes(restful.MIME_JSON).
6666
Produces(restful.MIME_JSON)
6767
deployWs.Route(
@@ -86,7 +86,7 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
8686
wsContainer.Add(deployWs)
8787

8888
deployFromFileWs := new(restful.WebService)
89-
deployFromFileWs.Path("/api/appdeploymentfromfile").
89+
deployFromFileWs.Path("/api/v1/appdeploymentfromfile").
9090
Consumes(restful.MIME_JSON).
9191
Produces(restful.MIME_JSON)
9292
deployFromFileWs.Route(
@@ -98,7 +98,7 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
9898

9999
replicationControllerWs := new(restful.WebService)
100100
replicationControllerWs.Filter(wsLogger)
101-
replicationControllerWs.Path("/api/replicationcontrollers").
101+
replicationControllerWs.Path("/api/v1/replicationcontrollers").
102102
Consumes(restful.MIME_JSON).
103103
Produces(restful.MIME_JSON)
104104
replicationControllerWs.Route(
@@ -124,7 +124,7 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
124124

125125
namespacesWs := new(restful.WebService)
126126
namespacesWs.Filter(wsLogger)
127-
namespacesWs.Path("/api/namespaces").
127+
namespacesWs.Path("/api/v1/namespaces").
128128
Consumes(restful.MIME_JSON).
129129
Produces(restful.MIME_JSON)
130130
namespacesWs.Route(
@@ -140,7 +140,7 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
140140

141141
logsWs := new(restful.WebService)
142142
logsWs.Filter(wsLogger)
143-
logsWs.Path("/api/logs").
143+
logsWs.Path("/api/v1/logs").
144144
Produces(restful.MIME_JSON)
145145
logsWs.Route(
146146
logsWs.GET("/{namespace}/{podId}").
@@ -154,7 +154,7 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
154154

155155
eventsWs := new(restful.WebService)
156156
eventsWs.Filter(wsLogger)
157-
eventsWs.Path("/api/events").
157+
eventsWs.Path("/api/v1/events").
158158
Produces(restful.MIME_JSON)
159159
eventsWs.Route(
160160
eventsWs.GET("/{namespace}/{replicationController}").
@@ -163,7 +163,7 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
163163
wsContainer.Add(eventsWs)
164164

165165
secretsWs := new(restful.WebService)
166-
secretsWs.Path("/api/secrets").Produces(restful.MIME_JSON)
166+
secretsWs.Path("/api/v1/secrets").Produces(restful.MIME_JSON)
167167
secretsWs.Route(
168168
secretsWs.GET("/{namespace}").
169169
To(apiHandler.handleGetSecrets).

‎src/app/frontend/deploy/createnamespace_controller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export default class NamespaceDialogController {
9292
let namespaceSpec = {name: this.namespace};
9393

9494
/** @type {!angular.Resource<!backendApi.NamespaceSpec>} */
95-
let resource = this.resource_('api/namespaces');
95+
let resource = this.resource_('api/v1/namespaces');
9696

9797
resource.save(
9898
namespaceSpec,

‎src/app/frontend/deploy/createsecret_controller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export default class CreateSecretController {
102102
data: this.data,
103103
};
104104
/** @type {!angular.Resource<!backendApi.SecretSpec>} */
105-
let resource = this.resource_(`api/secrets/`);
105+
let resource = this.resource_(`api/v1/secrets/`);
106106

107107
resource.save(
108108
secretSpec,

‎src/app/frontend/deploy/deploy_stateconfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default function stateConfig($stateProvider) {
4242
*/
4343
function resolveNamespaces($resource) {
4444
/** @type {!angular.Resource<!backendApi.NamespaceList>} */
45-
let resource = $resource('api/namespaces');
45+
let resource = $resource('api/v1/namespaces');
4646

4747
return resource.get().$promise;
4848
}
@@ -53,7 +53,7 @@ function resolveNamespaces($resource) {
5353
* @ngInject
5454
*/
5555
function getProtocolsResource($resource) {
56-
return $resource('api/appdeployments/protocols');
56+
return $resource('api/v1/appdeployments/protocols');
5757
}
5858

5959
/**

‎src/app/frontend/deploy/deployfromfile_controller.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default class DeployFromFileController {
7878
let defer = this.q_.defer();
7979

8080
/** @type {!angular.Resource<!backendApi.AppDeploymentFromFileSpec>} */
81-
let resource = this.resource_('api/appdeploymentfromfile');
81+
let resource = this.resource_('api/v1/appdeploymentfromfile');
8282
resource.save(
8383
deploymentSpec,
8484
(savedConfig) => {

‎src/app/frontend/deploy/deployfromsettings_controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export default class DeployFromSettingsController {
204204
let defer = this.q_.defer();
205205

206206
/** @type {!angular.Resource<!backendApi.AppDeploymentSpec>} */
207-
let resource = this.resource_('api/appdeployments');
207+
let resource = this.resource_('api/v1/appdeployments');
208208
resource.save(
209209
appDeploymentSpec,
210210
(savedConfig) => {
@@ -278,7 +278,7 @@ export default class DeployFromSettingsController {
278278
*/
279279
getSecrets(namespace) {
280280
/** @type {!angular.Resource<!backendApi.SecretsList>} */
281-
let resource = this.resource_(`api/secrets/${namespace}`);
281+
let resource = this.resource_(`api/v1/secrets/${namespace}`);
282282
resource.get(
283283
(res) => { this.secrets = res.secrets; },
284284
(err) => { this.log_.log(`Error getting secrets: ${err}`); });

‎src/app/frontend/deploy/uniquename_directive.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function validate(name, namespace, resource, q) {
5353
let deferred = q.defer();
5454

5555
/** @type {!angular.Resource<!backendApi.AppNameValiditySpec>} */
56-
let resourceClass = resource('api/appdeployments/validate/name');
56+
let resourceClass = resource('api/v1/appdeployments/validate/name');
5757
/** @type {!backendApi.AppNameValiditySpec} */
5858
let spec = {name: name, namespace: namespace};
5959
resourceClass.save(

‎src/app/frontend/deploy/validprotocol_directive.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function validate(ngModelController, externalChanged, protocol, isExternal, reso
6868
}
6969

7070
/** @type {!angular.Resource<!backendApi.ProtocolValiditySpec>} */
71-
let resourceClass = resource('api/appdeployments/validate/protocol');
71+
let resourceClass = resource('api/v1/appdeployments/validate/protocol');
7272
/** @type {!backendApi.ProtocolValiditySpec} */
7373
let spec = {protocol: protocol, isExternal: isExternal};
7474
resourceClass.save(

‎src/app/frontend/logs/logs_stateconfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default function stateConfig($stateProvider) {
5656
function resolveReplicationControllerPods($stateParams, $resource) {
5757
/** @type {!angular.Resource<!backendApi.ReplicationControllerPods>} */
5858
let resource = $resource(
59-
`api/replicationcontrollers/pods/${$stateParams.namespace}/${$stateParams.replicationController}`);
59+
`api/v1/replicationcontrollers/pods/${$stateParams.namespace}/${$stateParams.replicationController}`);
6060

6161
return resource.get().$promise;
6262
}
@@ -69,7 +69,7 @@ function resolveReplicationControllerPods($stateParams, $resource) {
6969
*/
7070
function resolvePodLogs($stateParams, $resource) {
7171
/** @type {!angular.Resource<!backendApi.Logs>} */
72-
let resource = $resource(`api/logs/${$stateParams.namespace}/${$stateParams.podId}/${$stateParams.container}`);
72+
let resource = $resource(`api/v1/logs/${$stateParams.namespace}/${$stateParams.podId}/${$stateParams.container}`);
7373

7474
return resource.get().$promise;
7575
}

‎src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail_stateconfig.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export default function stateConfig($stateProvider) {
4444
*/
4545
export function getReplicationControllerDetailsResource($stateParams, $resource) {
4646
return $resource(
47-
`api/replicationcontrollers/${$stateParams.namespace}/${$stateParams.replicationController}`);
47+
`api/v1/replicationcontrollers/${$stateParams.namespace}/` +
48+
`${$stateParams.replicationController}`);
4849
}
4950

5051
/**
@@ -54,7 +55,9 @@ export function getReplicationControllerDetailsResource($stateParams, $resource)
5455
* @ngInject
5556
*/
5657
export function getReplicationControllerSpecPodsResource($stateParams, $resource) {
57-
return $resource(`api/replicationcontrollers/${$stateParams.namespace}/${$stateParams.replicationController}/update/pods`);
58+
return $resource(
59+
`api/v1/replicationcontrollers/${$stateParams.namespace}/` +
60+
`${$stateParams.replicationController}/update/pods`);
5861
}
5962

6063
/**
@@ -76,7 +79,7 @@ function resolveReplicationControllerDetails(replicationControllerDetailResource
7679
function resolveReplicationControllerEvents($stateParams, $resource) {
7780
/** @type {!angular.Resource<!backendApi.Events>} */
7881
let resource =
79-
$resource(`api/events/${$stateParams.namespace}/${$stateParams.replicationController}`);
82+
$resource(`api/v1/events/${$stateParams.namespace}/${$stateParams.replicationController}`);
8083

8184
return resource.get().$promise;
8285
}

0 commit comments

Comments
 (0)