Merge pull request #10727 from ywk253100/200214_bump_up_legacy_api_version

Bump up legacy api version to v2.0

Makefile

@@ -484,7 +484,7 @@ swagger_client:
 	wget -q https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.3.1/swagger-codegen-cli-2.3.1.jar -O swagger-codegen-cli.jar
 	rm -rf harborclient
 	mkdir harborclient
-	java -jar swagger-codegen-cli.jar generate -i api/harbor/swagger.yaml -l python -o harborclient
+	java -jar swagger-codegen-cli.jar generate -i api/v2.0/legacy_swagger.yaml -l python -o harborclient
 	cd harborclient; python ./setup.py install
 	pip install docker -q
 	pip freeze

api/v2.0/legacy_swagger.yaml

@@ -2,12 +2,12 @@ swagger: '2.0'
 info:
   title: Harbor API
   description: These APIs provide services for manipulating Harbor project.
-  version: 1.10.0
+  version: '2.0'
 host: localhost
 schemes:
   - http
   - https
-basePath: /api
+basePath: /api/v2.0
 produces:
   - application/json
   - text/plain
@@ -2328,60 +2328,6 @@ paths:
           description: No registry found.
         '500':
           description: Unexpected internal errors.
-  /internal/syncregistry:
-    post:
-      summary: Sync repositories from registry to DB.
-      description: |
-        This endpoint is for syncing all repositories of registry with database.
-      tags:
-        - Products
-      responses:
-        '200':
-          description: Sync repositories successfully.
-        '401':
-          description: User need to log in first.
-        '403':
-          description: User does not have permission of admin role.
-        '415':
-          $ref: '#/responses/UnsupportedMediaType'
-        '500':
-          description: Unexpected internal errors.
-  /internal/syncquota:
-    post:
-      summary: Sync quota from registry/chart to DB.
-      description: |
-        This endpoint is for syncing quota usage of registry/chart with database.
-      tags:
-        - Products
-      responses:
-        '200':
-          description: Sync repositories successfully.
-        '401':
-          description: User need to log in first.
-        '403':
-          description: User does not have permission of system admin role.
-  /internal/switchquota:
-    put:
-      summary: Enable or disable quota.
-      description: |
-        This endpoint is for enable/disable quota. When quota is disabled, no resource require/release in image/chart push and delete.
-      tags:
-        - Products
-      parameters:
-        - name: switcher
-          in: body
-          required: true
-          schema:
-            $ref: '#/definitions/QuotaSwitcher'
-      responses:
-        '200':
-          description: Enable/Disable quota successfully.
-        '401':
-          description: User need to log in first.
-        '403':
-          description: User does not have permission of system admin role.
-        '500':
-          description: Unexpected internal errors.
   /systeminfo:
     get:
       summary: Get general system info

make/photon/portal/Dockerfile

@@ -11,7 +11,7 @@ RUN apt-get update \
 COPY src/portal/package.json /build_dir
 COPY src/portal/package-lock.json /build_dir
 COPY src/portal/scripts /build_dir
-COPY ./api/harbor/swagger.yaml /build_dir
+COPY ./api/v2.0/legacy_swagger.yaml /build_dir/swagger.yaml
 COPY ./api/v2.0/swagger.yaml /build_dir/swagger2.yaml
 
 RUN python -c 'import sys, yaml, json; y=yaml.load(sys.stdin.read()); print json.dumps(y)' < swagger.yaml > swagger.json

src/portal/src/app/app.module.ts

@@ -45,6 +45,7 @@ import { LabelsComponent } from './labels/labels.component';
 import { ProjectQuotasComponent } from './project-quotas/project-quotas.component';
 import { HarborLibraryModule } from "../lib/harbor-library.module";
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { BaseHrefInterceptService } from "./base-href-intercept.service";
 
 registerLocaleData(zh, 'zh-cn');
 registerLocaleData(es, 'es-es');
@@ -98,6 +99,7 @@ export function getCurrentLanguage(translateService: TranslateService) {
             multi: true
         },
         { provide: LOCALE_ID, useValue: "en-US" },
+        { provide: HTTP_INTERCEPTORS, useClass: BaseHrefInterceptService, multi: true },
         { provide: HTTP_INTERCEPTORS, useClass: InterceptHttpService, multi: true }
 
     ],

src/portal/src/app/base-href-intercept.service.spec.ts

@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { BaseHrefInterceptService } from "./base-href-intercept.service";
+
+
+describe('BaseHrefSwitchService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        BaseHrefInterceptService
+      ]
+    });
+  });
+
+  it('should be created', () => {
+    const service: BaseHrefInterceptService = TestBed.get(BaseHrefInterceptService);
+    expect(service).toBeTruthy();
+  });
+});

src/portal/src/app/base-href-intercept.service.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http';
+import { Observable } from "rxjs";
+
+const BASE_HREF = '/api';
+enum APILevels {
+  'V1.0' = '',
+  'V2.0' = '/v2.0'
+}
+@Injectable()
+export class BaseHrefInterceptService implements HttpInterceptor {
+  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<any> {
+    let url: string = req.url;
+    // use API level v2.0
+    if (url && url.indexOf(BASE_HREF) !== -1 && url.indexOf(BASE_HREF + APILevels["V2.0"]) === -1) {
+      url = BASE_HREF + APILevels["V2.0"] + url.split(BASE_HREF)[1];
+    }
+    const apiReq = req.clone({url});
+    return next.handle(apiReq);
+  }
+}
+

src/server/route.go

@@ -0,0 +1,68 @@
+// Copyright Project Harbor Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package server
+
+import (
+	"github.com/astaxie/beego"
+	"github.com/goharbor/harbor/src/common"
+	"github.com/goharbor/harbor/src/core/api"
+	"github.com/goharbor/harbor/src/core/config"
+	"github.com/goharbor/harbor/src/core/controllers"
+	"github.com/goharbor/harbor/src/core/service/notifications/admin"
+	"github.com/goharbor/harbor/src/core/service/notifications/jobs"
+	"github.com/goharbor/harbor/src/core/service/notifications/registry"
+	"github.com/goharbor/harbor/src/core/service/notifications/scheduler"
+	"github.com/goharbor/harbor/src/core/service/token"
+)
+
+func registerRoutes() {
+	// Controller API:
+	beego.Router("/c/login", &controllers.CommonController{}, "post:Login")
+	beego.Router("/c/log_out", &controllers.CommonController{}, "get:LogOut")
+	beego.Router("/c/reset", &controllers.CommonController{}, "post:ResetPassword")
+	beego.Router("/c/userExists", &controllers.CommonController{}, "post:UserExists")
+	beego.Router("/c/sendEmail", &controllers.CommonController{}, "get:SendResetEmail")
+	beego.Router(common.OIDCLoginPath, &controllers.OIDCController{}, "get:RedirectLogin")
+	beego.Router("/c/oidc/onboard", &controllers.OIDCController{}, "post:Onboard")
+	beego.Router(common.OIDCCallbackPath, &controllers.OIDCController{}, "get:Callback")
+
+	beego.Router("/api/internal/configurations", &api.ConfigAPI{}, "get:GetInternalConfig;put:Put")
+	beego.Router("/api/internal/syncregistry", &api.InternalAPI{}, "post:SyncRegistry")
+	beego.Router("/api/internal/renameadmin", &api.InternalAPI{}, "post:RenameAdmin")
+	beego.Router("/api/internal/switchquota", &api.InternalAPI{}, "put:SwitchQuota")
+	beego.Router("/api/internal/syncquota", &api.InternalAPI{}, "post:SyncQuota")
+
+	beego.Router("/service/notifications", &registry.NotificationHandler{})
+	beego.Router("/service/notifications/jobs/adminjob/:id([0-9]+)", &admin.Handler{}, "post:HandleAdminJob")
+	beego.Router("/service/notifications/jobs/replication/:id([0-9]+)", &jobs.Handler{}, "post:HandleReplicationScheduleJob")
+	beego.Router("/service/notifications/jobs/replication/task/:id([0-9]+)", &jobs.Handler{}, "post:HandleReplicationTask")
+	beego.Router("/service/notifications/jobs/webhook/:id([0-9]+)", &jobs.Handler{}, "post:HandleNotificationJob")
+	beego.Router("/service/notifications/jobs/retention/task/:id([0-9]+)", &jobs.Handler{}, "post:HandleRetentionTask")
+	beego.Router("/service/notifications/schedules/:id([0-9]+)", &scheduler.Handler{}, "post:Handle")
+	beego.Router("/service/notifications/jobs/scan/:uuid", &jobs.Handler{}, "post:HandleScan")
+
+	beego.Router("/service/token", &token.Handler{})
+
+	// chart repository services
+	if config.WithChartMuseum() {
+		chartRepositoryAPIType := &api.ChartRepositoryAPI{}
+		beego.Router("/chartrepo/:repo/index.yaml", chartRepositoryAPIType, "get:GetIndexByRepo")
+		beego.Router("/chartrepo/index.yaml", chartRepositoryAPIType, "get:GetIndex")
+		beego.Router("/chartrepo/:repo/charts/:filename", chartRepositoryAPIType, "get:DownloadChart")
+	}
+
+	// Error pages
+	beego.ErrorController(&controllers.ErrorController{})
+}

src/server/server.go

@@ -16,15 +16,12 @@ package server
 
 import (
 	"github.com/goharbor/harbor/src/server/registry"
-	// "github.com/goharbor/harbor/src/server/registry"
-	v1 "github.com/goharbor/harbor/src/server/v1.0/route"
 	v2 "github.com/goharbor/harbor/src/server/v2.0/route"
 )
 
 // RegisterRoutes register all routes
 func RegisterRoutes() {
-	// TODO move the v1 APIs to v2
+	registerRoutes()          // service/internal API/UI controller/etc.
-	v1.RegisterRoutes()       // v1.0 APIs
-	v2.RegisterRoutes()       // v2.0 APIs
 	registry.RegisterRoutes() // OCI registry APIs
+	v2.RegisterRoutes()       // v2.0 APIs
 }

src/server/v1.0/route/route.go

@@ -1,215 +0,0 @@
-// Copyright 2018 Project Harbor Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package route
-
-import (
-	"github.com/astaxie/beego"
-	"github.com/goharbor/harbor/src/common"
-	"github.com/goharbor/harbor/src/core/api"
-	"github.com/goharbor/harbor/src/core/config"
-	"github.com/goharbor/harbor/src/core/controllers"
-	"github.com/goharbor/harbor/src/core/service/notifications/admin"
-	"github.com/goharbor/harbor/src/core/service/notifications/jobs"
-	"github.com/goharbor/harbor/src/core/service/notifications/registry"
-	"github.com/goharbor/harbor/src/core/service/notifications/scheduler"
-	"github.com/goharbor/harbor/src/core/service/token"
-)
-
-// RegisterRoutes for Harbor v1.0 APIs
-// TODO split the APIs and other services/controllers
-func RegisterRoutes() {
-	// Controller API:
-	beego.Router("/c/login", &controllers.CommonController{}, "post:Login")
-	beego.Router("/c/log_out", &controllers.CommonController{}, "get:LogOut")
-	beego.Router("/c/reset", &controllers.CommonController{}, "post:ResetPassword")
-	beego.Router("/c/userExists", &controllers.CommonController{}, "post:UserExists")
-	beego.Router("/c/sendEmail", &controllers.CommonController{}, "get:SendResetEmail")
-	beego.Router(common.OIDCLoginPath, &controllers.OIDCController{}, "get:RedirectLogin")
-	beego.Router("/c/oidc/onboard", &controllers.OIDCController{}, "post:Onboard")
-	beego.Router(common.OIDCCallbackPath, &controllers.OIDCController{}, "get:Callback")
-
-	// API:
-	beego.Router("/api/projects/:pid([0-9]+)/members/?:pmid([0-9]+)", &api.ProjectMemberAPI{})
-	beego.Router("/api/projects/", &api.ProjectAPI{}, "head:Head")
-	beego.Router("/api/projects/:id([0-9]+)", &api.ProjectAPI{})
-	beego.Router("/api/users/:id", &api.UserAPI{}, "get:Get;delete:Delete;put:Put")
-	beego.Router("/api/users", &api.UserAPI{}, "get:List;post:Post")
-	beego.Router("/api/users/search", &api.UserAPI{}, "get:Search")
-	beego.Router("/api/users/:id([0-9]+)/password", &api.UserAPI{}, "put:ChangePassword")
-	beego.Router("/api/users/:id/permissions", &api.UserAPI{}, "get:ListUserPermissions")
-	beego.Router("/api/users/:id/sysadmin", &api.UserAPI{}, "put:ToggleUserAdminRole")
-	beego.Router("/api/users/:id/cli_secret", &api.UserAPI{}, "put:SetCLISecret")
-	beego.Router("/api/usergroups/?:ugid([0-9]+)", &api.UserGroupAPI{})
-	beego.Router("/api/ldap/ping", &api.LdapAPI{}, "post:Ping")
-	beego.Router("/api/ldap/users/search", &api.LdapAPI{}, "get:Search")
-	beego.Router("/api/ldap/groups/search", &api.LdapAPI{}, "get:SearchGroup")
-	beego.Router("/api/ldap/users/import", &api.LdapAPI{}, "post:ImportUser")
-	beego.Router("/api/email/ping", &api.EmailAPI{}, "post:Ping")
-	beego.Router("/api/health", &api.HealthAPI{}, "get:CheckHealth")
-	beego.Router("/api/ping", &api.SystemInfoAPI{}, "get:Ping")
-	beego.Router("/api/search", &api.SearchAPI{})
-	beego.Router("/api/projects/", &api.ProjectAPI{}, "get:List;post:Post")
-	beego.Router("/api/projects/:id([0-9]+)/summary", &api.ProjectAPI{}, "get:Summary")
-	beego.Router("/api/projects/:id([0-9]+)/logs", &api.ProjectAPI{}, "get:Logs")
-	beego.Router("/api/projects/:id([0-9]+)/_deletable", &api.ProjectAPI{}, "get:Deletable")
-	beego.Router("/api/projects/:id([0-9]+)/metadatas/?:name", &api.MetadataAPI{}, "get:Get")
-	beego.Router("/api/projects/:id([0-9]+)/metadatas/", &api.MetadataAPI{}, "post:Post")
-	beego.Router("/api/projects/:pid([0-9]+)/robots", &api.RobotAPI{}, "post:Post;get:List")
-	beego.Router("/api/projects/:pid([0-9]+)/robots/:id([0-9]+)", &api.RobotAPI{}, "get:Get;put:Put;delete:Delete")
-
-	beego.Router("/api/quotas", &api.QuotaAPI{}, "get:List")
-	beego.Router("/api/quotas/:id([0-9]+)", &api.QuotaAPI{}, "get:Get;put:Put")
-
-	beego.Router("/api/repositories", &api.RepositoryAPI{}, "get:Get")
-	beego.Router("/api/repositories/*", &api.RepositoryAPI{}, "delete:Delete;put:Put")
-	beego.Router("/api/repositories/*/labels", &api.RepositoryLabelAPI{}, "get:GetOfRepository;post:AddToRepository")
-	beego.Router("/api/repositories/*/labels/:id([0-9]+)", &api.RepositoryLabelAPI{}, "delete:RemoveFromRepository")
-	beego.Router("/api/repositories/*/tags/:tag", &api.RepositoryAPI{}, "delete:Delete;get:GetTag")
-	beego.Router("/api/repositories/*/tags/:tag/labels", &api.RepositoryLabelAPI{}, "get:GetOfImage;post:AddToImage")
-	beego.Router("/api/repositories/*/tags/:tag/labels/:id([0-9]+)", &api.RepositoryLabelAPI{}, "delete:RemoveFromImage")
-	beego.Router("/api/repositories/*/tags", &api.RepositoryAPI{}, "get:GetTags;post:Retag")
-	beego.Router("/api/repositories/*/tags/:tag/manifest", &api.RepositoryAPI{}, "get:GetManifests")
-	beego.Router("/api/repositories/*/signatures", &api.RepositoryAPI{}, "get:GetSignatures")
-	beego.Router("/api/repositories/top", &api.RepositoryAPI{}, "get:GetTopRepos")
-
-	beego.Router("/api/system/gc", &api.GCAPI{}, "get:List")
-	beego.Router("/api/system/gc/:id", &api.GCAPI{}, "get:GetGC")
-	beego.Router("/api/system/gc/:id([0-9]+)/log", &api.GCAPI{}, "get:GetLog")
-	beego.Router("/api/system/gc/schedule", &api.GCAPI{}, "get:Get;put:Put;post:Post")
-	beego.Router("/api/system/scanAll/schedule", &api.ScanAllAPI{}, "get:Get;put:Put;post:Post")
-	beego.Router("/api/system/CVEWhitelist", &api.SysCVEWhitelistAPI{}, "get:Get;put:Put")
-	beego.Router("/api/system/oidc/ping", &api.OIDCAPI{}, "post:Ping")
-
-	beego.Router("/api/logs", &api.LogAPI{})
-
-	beego.Router("/api/replication/adapters", &api.ReplicationAdapterAPI{}, "get:List")
-	beego.Router("/api/replication/adapterinfos", &api.ReplicationAdapterAPI{}, "get:ListAdapterInfos")
-	beego.Router("/api/replication/executions", &api.ReplicationOperationAPI{}, "get:ListExecutions;post:CreateExecution")
-	beego.Router("/api/replication/executions/:id([0-9]+)", &api.ReplicationOperationAPI{}, "get:GetExecution;put:StopExecution")
-	beego.Router("/api/replication/executions/:id([0-9]+)/tasks", &api.ReplicationOperationAPI{}, "get:ListTasks")
-	beego.Router("/api/replication/executions/:id([0-9]+)/tasks/:tid([0-9]+)/log", &api.ReplicationOperationAPI{}, "get:GetTaskLog")
-
-	beego.Router("/api/replication/policies", &api.ReplicationPolicyAPI{}, "get:List;post:Create")
-	beego.Router("/api/replication/policies/:id([0-9]+)", &api.ReplicationPolicyAPI{}, "get:Get;put:Update;delete:Delete")
-
-	beego.Router("/api/projects/:pid([0-9]+)/webhook/policies", &api.NotificationPolicyAPI{}, "get:List;post:Post")
-	beego.Router("/api/projects/:pid([0-9]+)/webhook/policies/:id([0-9]+)", &api.NotificationPolicyAPI{})
-	beego.Router("/api/projects/:pid([0-9]+)/webhook/policies/test", &api.NotificationPolicyAPI{}, "post:Test")
-
-	beego.Router("/api/projects/:pid([0-9]+)/webhook/lasttrigger", &api.NotificationPolicyAPI{}, "get:ListGroupByEventType")
-
-	beego.Router("/api/projects/:pid([0-9]+)/webhook/jobs/", &api.NotificationJobAPI{}, "get:List")
-
-	beego.Router("/api/projects/:pid([0-9]+)/immutabletagrules", &api.ImmutableTagRuleAPI{}, "get:List;post:Post")
-	beego.Router("/api/projects/:pid([0-9]+)/immutabletagrules/:id([0-9]+)", &api.ImmutableTagRuleAPI{})
-
-	beego.Router("/api/internal/configurations", &api.ConfigAPI{}, "get:GetInternalConfig;put:Put")
-	beego.Router("/api/configurations", &api.ConfigAPI{}, "get:Get;put:Put")
-	beego.Router("/api/statistics", &api.StatisticAPI{})
-	beego.Router("/api/labels", &api.LabelAPI{}, "post:Post;get:List")
-	beego.Router("/api/labels/:id([0-9]+)", &api.LabelAPI{}, "get:Get;put:Put;delete:Delete")
-	beego.Router("/api/labels/:id([0-9]+)/resources", &api.LabelAPI{}, "get:ListResources")
-
-	beego.Router("/api/systeminfo", &api.SystemInfoAPI{}, "get:GetGeneralInfo")
-	beego.Router("/api/systeminfo/volumes", &api.SystemInfoAPI{}, "get:GetVolumeInfo")
-	beego.Router("/api/systeminfo/getcert", &api.SystemInfoAPI{}, "get:GetCert")
-
-	beego.Router("/api/internal/syncregistry", &api.InternalAPI{}, "post:SyncRegistry")
-	beego.Router("/api/internal/renameadmin", &api.InternalAPI{}, "post:RenameAdmin")
-	beego.Router("/api/internal/switchquota", &api.InternalAPI{}, "put:SwitchQuota")
-	beego.Router("/api/internal/syncquota", &api.InternalAPI{}, "post:SyncQuota")
-
-	// external service that hosted on harbor process:
-	beego.Router("/service/notifications", &registry.NotificationHandler{})
-	beego.Router("/service/notifications/jobs/adminjob/:id([0-9]+)", &admin.Handler{}, "post:HandleAdminJob")
-	beego.Router("/service/notifications/jobs/replication/:id([0-9]+)", &jobs.Handler{}, "post:HandleReplicationScheduleJob")
-	beego.Router("/service/notifications/jobs/replication/task/:id([0-9]+)", &jobs.Handler{}, "post:HandleReplicationTask")
-	beego.Router("/service/notifications/jobs/webhook/:id([0-9]+)", &jobs.Handler{}, "post:HandleNotificationJob")
-	beego.Router("/service/notifications/jobs/retention/task/:id([0-9]+)", &jobs.Handler{}, "post:HandleRetentionTask")
-	beego.Router("/service/notifications/schedules/:id([0-9]+)", &scheduler.Handler{}, "post:Handle")
-	beego.Router("/service/token", &token.Handler{})
-
-	beego.Router("/api/registries", &api.RegistryAPI{}, "get:List;post:Post")
-	beego.Router("/api/registries/:id([0-9]+)", &api.RegistryAPI{}, "get:Get;put:Put;delete:Delete")
-	beego.Router("/api/registries/ping", &api.RegistryAPI{}, "post:Ping")
-	// we use "0" as the ID of the local Harbor registry, so don't add "([0-9]+)" in the path
-	beego.Router("/api/registries/:id/info", &api.RegistryAPI{}, "get:GetInfo")
-	beego.Router("/api/registries/:id/namespace", &api.RegistryAPI{}, "get:GetNamespace")
-
-	beego.Router("/api/retentions/metadatas", &api.RetentionAPI{}, "get:GetMetadatas")
-	beego.Router("/api/retentions/:id", &api.RetentionAPI{}, "get:GetRetention")
-	beego.Router("/api/retentions", &api.RetentionAPI{}, "post:CreateRetention")
-	beego.Router("/api/retentions/:id", &api.RetentionAPI{}, "put:UpdateRetention")
-	beego.Router("/api/retentions/:id/executions", &api.RetentionAPI{}, "post:TriggerRetentionExec")
-	beego.Router("/api/retentions/:id/executions/:eid", &api.RetentionAPI{}, "patch:OperateRetentionExec")
-	beego.Router("/api/retentions/:id/executions", &api.RetentionAPI{}, "get:ListRetentionExecs")
-	beego.Router("/api/retentions/:id/executions/:eid/tasks", &api.RetentionAPI{}, "get:ListRetentionExecTasks")
-	beego.Router("/api/retentions/:id/executions/:eid/tasks/:tid", &api.RetentionAPI{}, "get:GetRetentionExecTaskLog")
-	beego.Router("/api/projects/:pid([0-9]+)/immutabletagrules", &api.ImmutableTagRuleAPI{}, "get:List;post:Post")
-	beego.Router("/api/projects/:pid([0-9]+)/immutabletagrules/:id([0-9]+)", &api.ImmutableTagRuleAPI{})
-
-	// APIs for chart repository
-	if config.WithChartMuseum() {
-		// Charts are controlled under projects
-		chartRepositoryAPIType := &api.ChartRepositoryAPI{}
-		beego.Router("/api/chartrepo/health", chartRepositoryAPIType, "get:GetHealthStatus")
-		beego.Router("/api/chartrepo/:repo/charts", chartRepositoryAPIType, "get:ListCharts")
-		beego.Router("/api/chartrepo/:repo/charts/:name", chartRepositoryAPIType, "get:ListChartVersions")
-		beego.Router("/api/chartrepo/:repo/charts/:name", chartRepositoryAPIType, "delete:DeleteChart")
-		beego.Router("/api/chartrepo/:repo/charts/:name/:version", chartRepositoryAPIType, "get:GetChartVersion")
-		beego.Router("/api/chartrepo/:repo/charts/:name/:version", chartRepositoryAPIType, "delete:DeleteChartVersion")
-		beego.Router("/api/chartrepo/:repo/charts", chartRepositoryAPIType, "post:UploadChartVersion")
-		beego.Router("/api/chartrepo/:repo/prov", chartRepositoryAPIType, "post:UploadChartProvFile")
-		beego.Router("/api/chartrepo/charts", chartRepositoryAPIType, "post:UploadChartVersion")
-
-		// Repository services
-		beego.Router("/chartrepo/:repo/index.yaml", chartRepositoryAPIType, "get:GetIndexByRepo")
-		beego.Router("/chartrepo/index.yaml", chartRepositoryAPIType, "get:GetIndex")
-		beego.Router("/chartrepo/:repo/charts/:filename", chartRepositoryAPIType, "get:DownloadChart")
-
-		// Labels for chart
-		chartLabelAPIType := &api.ChartLabelAPI{}
-		beego.Router("/api/chartrepo/:repo/charts/:name/:version/labels", chartLabelAPIType, "get:GetLabels;post:MarkLabel")
-		beego.Router("/api/chartrepo/:repo/charts/:name/:version/labels/:id([0-9]+)", chartLabelAPIType, "delete:RemoveLabel")
-	}
-
-	// Add routes for plugin scanner management
-	scannerAPI := &api.ScannerAPI{}
-	beego.Router("/api/scanners", scannerAPI, "post:Create;get:List")
-	beego.Router("/api/scanners/:uuid", scannerAPI, "get:Get;delete:Delete;put:Update;patch:SetAsDefault")
-	beego.Router("/api/scanners/:uuid/metadata", scannerAPI, "get:Metadata")
-	beego.Router("/api/scanners/ping", scannerAPI, "post:Ping")
-
-	// Add routes for project level scanner
-	proScannerAPI := &api.ProjectScannerAPI{}
-	beego.Router("/api/projects/:pid([0-9]+)/scanner", proScannerAPI, "get:GetProjectScanner;put:SetProjectScanner")
-	beego.Router("/api/projects/:pid([0-9]+)/scanner/candidates", proScannerAPI, "get:GetProScannerCandidates")
-
-	// Add routes for scan
-	scanAPI := &api.ScanAPI{}
-	beego.Router("/api/repositories/*/tags/:tag/scan", scanAPI, "post:Scan;get:Report")
-	beego.Router("/api/repositories/*/tags/:tag/scan/:uuid/log", scanAPI, "get:Log")
-
-	// Handle scan hook
-	beego.Router("/service/notifications/jobs/scan/:uuid", &jobs.Handler{}, "post:HandleScan")
-
-	// Add routes for scan all metrics
-	scanAllAPI := &api.ScanAllAPI{}
-	beego.Router("/api/scans/all/metrics", scanAllAPI, "get:GetScanAllMetrics")
-	beego.Router("/api/scans/schedule/metrics", scanAllAPI, "get:GetScheduleMetrics")
-
-	// Error pages
-	beego.ErrorController(&controllers.ErrorController{})
-}

src/server/v2.0/route/legacy.go

@@ -0,0 +1,167 @@
+// Copyright 2018 Project Harbor Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package route
+
+import (
+	"github.com/astaxie/beego"
+	"github.com/goharbor/harbor/src/core/api"
+	"github.com/goharbor/harbor/src/core/config"
+)
+
+// RegisterRoutes for Harbor legacy APIs
+// TODO bump up the version of APIs called by clients
+func registerLegacyRoutes() {
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/members/?:pmid([0-9]+)", &api.ProjectMemberAPI{})
+	beego.Router("/api/"+version+"/projects/", &api.ProjectAPI{}, "head:Head")
+	beego.Router("/api/"+version+"/projects/:id([0-9]+)", &api.ProjectAPI{})
+	beego.Router("/api/"+version+"/users/:id", &api.UserAPI{}, "get:Get;delete:Delete;put:Put")
+	beego.Router("/api/"+version+"/users", &api.UserAPI{}, "get:List;post:Post")
+	beego.Router("/api/"+version+"/users/search", &api.UserAPI{}, "get:Search")
+	beego.Router("/api/"+version+"/users/:id([0-9]+)/password", &api.UserAPI{}, "put:ChangePassword")
+	beego.Router("/api/"+version+"/users/:id/permissions", &api.UserAPI{}, "get:ListUserPermissions")
+	beego.Router("/api/"+version+"/users/:id/sysadmin", &api.UserAPI{}, "put:ToggleUserAdminRole")
+	beego.Router("/api/"+version+"/users/:id/cli_secret", &api.UserAPI{}, "put:SetCLISecret")
+	beego.Router("/api/"+version+"/usergroups/?:ugid([0-9]+)", &api.UserGroupAPI{})
+	beego.Router("/api/"+version+"/ldap/ping", &api.LdapAPI{}, "post:Ping")
+	beego.Router("/api/"+version+"/ldap/users/search", &api.LdapAPI{}, "get:Search")
+	beego.Router("/api/"+version+"/ldap/groups/search", &api.LdapAPI{}, "get:SearchGroup")
+	beego.Router("/api/"+version+"/ldap/users/import", &api.LdapAPI{}, "post:ImportUser")
+	beego.Router("/api/"+version+"/email/ping", &api.EmailAPI{}, "post:Ping")
+	beego.Router("/api/"+version+"/health", &api.HealthAPI{}, "get:CheckHealth")
+	beego.Router("/api/"+version+"/ping", &api.SystemInfoAPI{}, "get:Ping")
+	beego.Router("/api/"+version+"/search", &api.SearchAPI{})
+	beego.Router("/api/"+version+"/projects/", &api.ProjectAPI{}, "get:List;post:Post")
+	beego.Router("/api/"+version+"/projects/:id([0-9]+)/summary", &api.ProjectAPI{}, "get:Summary")
+	beego.Router("/api/"+version+"/projects/:id([0-9]+)/logs", &api.ProjectAPI{}, "get:Logs")
+	beego.Router("/api/"+version+"/projects/:id([0-9]+)/_deletable", &api.ProjectAPI{}, "get:Deletable")
+	beego.Router("/api/"+version+"/projects/:id([0-9]+)/metadatas/?:name", &api.MetadataAPI{}, "get:Get")
+	beego.Router("/api/"+version+"/projects/:id([0-9]+)/metadatas/", &api.MetadataAPI{}, "post:Post")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/robots", &api.RobotAPI{}, "post:Post;get:List")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/robots/:id([0-9]+)", &api.RobotAPI{}, "get:Get;put:Put;delete:Delete")
+
+	beego.Router("/api/"+version+"/quotas", &api.QuotaAPI{}, "get:List")
+	beego.Router("/api/"+version+"/quotas/:id([0-9]+)", &api.QuotaAPI{}, "get:Get;put:Put")
+
+	beego.Router("/api/"+version+"/repositories", &api.RepositoryAPI{}, "get:Get")
+	beego.Router("/api/"+version+"/repositories/*", &api.RepositoryAPI{}, "delete:Delete;put:Put")
+	beego.Router("/api/"+version+"/repositories/*/labels", &api.RepositoryLabelAPI{}, "get:GetOfRepository;post:AddToRepository")
+	beego.Router("/api/"+version+"/repositories/*/labels/:id([0-9]+)", &api.RepositoryLabelAPI{}, "delete:RemoveFromRepository")
+	beego.Router("/api/"+version+"/repositories/*/tags/:tag", &api.RepositoryAPI{}, "delete:Delete;get:GetTag")
+	beego.Router("/api/"+version+"/repositories/*/tags/:tag/labels", &api.RepositoryLabelAPI{}, "get:GetOfImage;post:AddToImage")
+	beego.Router("/api/"+version+"/repositories/*/tags/:tag/labels/:id([0-9]+)", &api.RepositoryLabelAPI{}, "delete:RemoveFromImage")
+	beego.Router("/api/"+version+"/repositories/*/tags", &api.RepositoryAPI{}, "get:GetTags;post:Retag")
+	beego.Router("/api/"+version+"/repositories/*/tags/:tag/manifest", &api.RepositoryAPI{}, "get:GetManifests")
+	beego.Router("/api/"+version+"/repositories/*/signatures", &api.RepositoryAPI{}, "get:GetSignatures")
+	beego.Router("/api/"+version+"/repositories/top", &api.RepositoryAPI{}, "get:GetTopRepos")
+
+	beego.Router("/api/"+version+"/system/gc", &api.GCAPI{}, "get:List")
+	beego.Router("/api/"+version+"/system/gc/:id", &api.GCAPI{}, "get:GetGC")
+	beego.Router("/api/"+version+"/system/gc/:id([0-9]+)/log", &api.GCAPI{}, "get:GetLog")
+	beego.Router("/api/"+version+"/system/gc/schedule", &api.GCAPI{}, "get:Get;put:Put;post:Post")
+	beego.Router("/api/"+version+"/system/scanAll/schedule", &api.ScanAllAPI{}, "get:Get;put:Put;post:Post")
+	beego.Router("/api/"+version+"/system/CVEWhitelist", &api.SysCVEWhitelistAPI{}, "get:Get;put:Put")
+	beego.Router("/api/"+version+"/system/oidc/ping", &api.OIDCAPI{}, "post:Ping")
+
+	beego.Router("/api/"+version+"/logs", &api.LogAPI{})
+
+	beego.Router("/api/"+version+"/replication/adapters", &api.ReplicationAdapterAPI{}, "get:List")
+	beego.Router("/api/"+version+"/replication/adapterinfos", &api.ReplicationAdapterAPI{}, "get:ListAdapterInfos")
+	beego.Router("/api/"+version+"/replication/executions", &api.ReplicationOperationAPI{}, "get:ListExecutions;post:CreateExecution")
+	beego.Router("/api/"+version+"/replication/executions/:id([0-9]+)", &api.ReplicationOperationAPI{}, "get:GetExecution;put:StopExecution")
+	beego.Router("/api/"+version+"/replication/executions/:id([0-9]+)/tasks", &api.ReplicationOperationAPI{}, "get:ListTasks")
+	beego.Router("/api/"+version+"/replication/executions/:id([0-9]+)/tasks/:tid([0-9]+)/log", &api.ReplicationOperationAPI{}, "get:GetTaskLog")
+	beego.Router("/api/"+version+"/replication/policies", &api.ReplicationPolicyAPI{}, "get:List;post:Create")
+	beego.Router("/api/"+version+"/replication/policies/:id([0-9]+)", &api.ReplicationPolicyAPI{}, "get:Get;put:Update;delete:Delete")
+
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/webhook/policies", &api.NotificationPolicyAPI{}, "get:List;post:Post")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/webhook/policies/:id([0-9]+)", &api.NotificationPolicyAPI{})
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/webhook/policies/test", &api.NotificationPolicyAPI{}, "post:Test")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/webhook/lasttrigger", &api.NotificationPolicyAPI{}, "get:ListGroupByEventType")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/webhook/jobs/", &api.NotificationJobAPI{}, "get:List")
+
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/immutabletagrules", &api.ImmutableTagRuleAPI{}, "get:List;post:Post")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/immutabletagrules/:id([0-9]+)", &api.ImmutableTagRuleAPI{})
+
+	beego.Router("/api/"+version+"/configurations", &api.ConfigAPI{}, "get:Get;put:Put")
+	beego.Router("/api/"+version+"/statistics", &api.StatisticAPI{})
+	beego.Router("/api/"+version+"/labels", &api.LabelAPI{}, "post:Post;get:List")
+	beego.Router("/api/"+version+"/labels/:id([0-9]+)", &api.LabelAPI{}, "get:Get;put:Put;delete:Delete")
+	beego.Router("/api/"+version+"/labels/:id([0-9]+)/resources", &api.LabelAPI{}, "get:ListResources")
+
+	beego.Router("/api/"+version+"/systeminfo", &api.SystemInfoAPI{}, "get:GetGeneralInfo")
+	beego.Router("/api/"+version+"/systeminfo/volumes", &api.SystemInfoAPI{}, "get:GetVolumeInfo")
+	beego.Router("/api/"+version+"/systeminfo/getcert", &api.SystemInfoAPI{}, "get:GetCert")
+
+	beego.Router("/api/"+version+"/registries", &api.RegistryAPI{}, "get:List;post:Post")
+	beego.Router("/api/"+version+"/registries/:id([0-9]+)", &api.RegistryAPI{}, "get:Get;put:Put;delete:Delete")
+	beego.Router("/api/"+version+"/registries/ping", &api.RegistryAPI{}, "post:Ping")
+	// we use "0" as the ID of the local Harbor registry, so don't add "([0-9]+)" in the path
+	beego.Router("/api/"+version+"/registries/:id/info", &api.RegistryAPI{}, "get:GetInfo")
+	beego.Router("/api/"+version+"/registries/:id/namespace", &api.RegistryAPI{}, "get:GetNamespace")
+
+	beego.Router("/api/"+version+"/retentions/metadatas", &api.RetentionAPI{}, "get:GetMetadatas")
+	beego.Router("/api/"+version+"/retentions/:id", &api.RetentionAPI{}, "get:GetRetention")
+	beego.Router("/api/"+version+"/retentions", &api.RetentionAPI{}, "post:CreateRetention")
+	beego.Router("/api/"+version+"/retentions/:id", &api.RetentionAPI{}, "put:UpdateRetention")
+	beego.Router("/api/"+version+"/retentions/:id/executions", &api.RetentionAPI{}, "post:TriggerRetentionExec")
+	beego.Router("/api/"+version+"/retentions/:id/executions/:eid", &api.RetentionAPI{}, "patch:OperateRetentionExec")
+	beego.Router("/api/"+version+"/retentions/:id/executions", &api.RetentionAPI{}, "get:ListRetentionExecs")
+	beego.Router("/api/"+version+"/retentions/:id/executions/:eid/tasks", &api.RetentionAPI{}, "get:ListRetentionExecTasks")
+	beego.Router("/api/"+version+"/retentions/:id/executions/:eid/tasks/:tid", &api.RetentionAPI{}, "get:GetRetentionExecTaskLog")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/immutabletagrules", &api.ImmutableTagRuleAPI{}, "get:List;post:Post")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/immutabletagrules/:id([0-9]+)", &api.ImmutableTagRuleAPI{})
+
+	// APIs for chart repository
+	if config.WithChartMuseum() {
+		// Charts are controlled under projects
+		chartRepositoryAPIType := &api.ChartRepositoryAPI{}
+		beego.Router("/api/"+version+"/chartrepo/health", chartRepositoryAPIType, "get:GetHealthStatus")
+		beego.Router("/api/"+version+"/chartrepo/:repo/charts", chartRepositoryAPIType, "get:ListCharts")
+		beego.Router("/api/"+version+"/chartrepo/:repo/charts/:name", chartRepositoryAPIType, "get:ListChartVersions")
+		beego.Router("/api/"+version+"/chartrepo/:repo/charts/:name", chartRepositoryAPIType, "delete:DeleteChart")
+		beego.Router("/api/"+version+"/chartrepo/:repo/charts/:name/:version", chartRepositoryAPIType, "get:GetChartVersion")
+		beego.Router("/api/"+version+"/chartrepo/:repo/charts/:name/:version", chartRepositoryAPIType, "delete:DeleteChartVersion")
+		beego.Router("/api/"+version+"/chartrepo/:repo/charts", chartRepositoryAPIType, "post:UploadChartVersion")
+		beego.Router("/api/"+version+"/chartrepo/:repo/prov", chartRepositoryAPIType, "post:UploadChartProvFile")
+		beego.Router("/api/"+version+"/chartrepo/charts", chartRepositoryAPIType, "post:UploadChartVersion")
+
+		// Labels for chart
+		chartLabelAPIType := &api.ChartLabelAPI{}
+		beego.Router("/api/"+version+"/chartrepo/:repo/charts/:name/:version/labels", chartLabelAPIType, "get:GetLabels;post:MarkLabel")
+		beego.Router("/api/"+version+"/chartrepo/:repo/charts/:name/:version/labels/:id([0-9]+)", chartLabelAPIType, "delete:RemoveLabel")
+	}
+
+	// Add routes for plugin scanner management
+	scannerAPI := &api.ScannerAPI{}
+	beego.Router("/api/"+version+"/scanners", scannerAPI, "post:Create;get:List")
+	beego.Router("/api/"+version+"/scanners/:uuid", scannerAPI, "get:Get;delete:Delete;put:Update;patch:SetAsDefault")
+	beego.Router("/api/"+version+"/scanners/:uuid/metadata", scannerAPI, "get:Metadata")
+	beego.Router("/api/"+version+"/scanners/ping", scannerAPI, "post:Ping")
+
+	// Add routes for project level scanner
+	proScannerAPI := &api.ProjectScannerAPI{}
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/scanner", proScannerAPI, "get:GetProjectScanner;put:SetProjectScanner")
+	beego.Router("/api/"+version+"/projects/:pid([0-9]+)/scanner/candidates", proScannerAPI, "get:GetProScannerCandidates")
+
+	// Add routes for scan
+	scanAPI := &api.ScanAPI{}
+	beego.Router("/api/"+version+"/repositories/*/tags/:tag/scan", scanAPI, "post:Scan;get:Report")
+	beego.Router("/api/"+version+"/repositories/*/tags/:tag/scan/:uuid/log", scanAPI, "get:Log")
+
+	// Add routes for scan all metrics
+	scanAllAPI := &api.ScanAllAPI{}
+	beego.Router("/api/"+version+"/scans/all/metrics", scanAllAPI, "get:GetScanAllMetrics")
+	beego.Router("/api/"+version+"/scans/schedule/metrics", scanAllAPI, "get:GetScheduleMetrics")
+}

src/server/v2.0/route/route.go

@@ -26,6 +26,7 @@ const (
 
 // RegisterRoutes for Harbor v2.0 APIs
 func RegisterRoutes() {
+	registerLegacyRoutes()
 	router.NewRoute().Path("/api/" + version + "/*").
 		Middleware(apiversion.Middleware(version)).
 		Handler(handler.New())

tests/apitests/python/test_retention.py

@@ -89,8 +89,10 @@ class TestProjects(unittest.TestCase):
         self.assertEqual(len(resp), 4)
         resp=self.retention.get_retention_exec_task_log(retention_id,execution.id,resp[0].id, **TestProjects.USER_RA_CLIENT)
         print(resp)
-        resp=self.repo.get_repository(TestProjects.project_src_repo_id, **TestProjects.USER_RA_CLIENT)
+        # TODO As the repository isn't deleted when no tags left anymore
-        self.assertEqual(len(resp), 3)
+        # TODO we should check the artifact/tag count here
+        # resp=self.repo.get_repository(TestProjects.project_src_repo_id, **TestProjects.USER_RA_CLIENT)
+        # self.assertEqual(len(resp), 3)
 
 
     @classmethod

tests/apitests/python/testutils.py

@@ -12,14 +12,14 @@ admin_pwd = "Harbor12345"
 
 harbor_server = os.environ["HARBOR_HOST"]
 #CLIENT=dict(endpoint="https://"+harbor_server+"/api")
-ADMIN_CLIENT=dict(endpoint = os.environ.get("HARBOR_HOST_SCHEMA", "https")+ "://"+harbor_server+"/api", username = admin_user, password =  admin_pwd)
+ADMIN_CLIENT=dict(endpoint = os.environ.get("HARBOR_HOST_SCHEMA", "https")+ "://"+harbor_server+"/api/v2.0", username = admin_user, password =  admin_pwd)
 USER_ROLE=dict(admin=0,normal=1)
 TEARDOWN = True
 
 def GetProductApi(username, password, harbor_server= os.environ["HARBOR_HOST"]):
 
     cfg = swagger_client.Configuration()
-    cfg.host = "https://"+harbor_server+"/api"
+    cfg.host = "https://"+harbor_server+"/api/v2.0"
     cfg.username = username
     cfg.password = password
     cfg.verify_ssl = False

tests/configharbor.py

@@ -26,7 +26,7 @@ for item in args.config :
         reqJson[key] = value
 
 # Sample Basic Auth Url with login values as username and password
-url = "https://"+args.host+"/api/configurations"
+url = "https://"+args.host+"/api/v2.0/configurations"
 user = args.user
 passwd = args.password
 

tests/robot-cases/Group0-BAT/API_DB.robot

@@ -44,8 +44,9 @@ Test Case - Project Level Policy Content Trust
 # TODO uncomment this after making scan all work with OCI registry
 # Test Case - Scan All Images
 #     Harbor API Test  ./tests/apitests/python/test_scan_all_images.py
-Test Case - List Helm Charts
+# TODO uncomment this after bump up chart API version to v2.0
-    Harbor API Test  ./tests/apitests/python/test_list_helm_charts.py
+# Test Case - List Helm Charts
+#     Harbor API Test  ./tests/apitests/python/test_list_helm_charts.py
 Test Case - Assign Sys Admin
     Harbor API Test  ./tests/apitests/python/test_assign_sys_admin.py
 Test Case - Retag Image