Fix Harbor incompatibility (#55)

Author: scottmbaker

VERSION

@@ -1 +1 @@
-0.3.10-dev
+0.3.10

build/Dockerfile

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM golang:1.24.2@sha256:d9db32125db0c3a680cfb7a1afcaefb89c898a075ec148fdc2f0f646cc2ed509 AS build
+FROM golang:1.24.4@sha256:20a022e5112a144aa7b7aeb3f22ebf2cdaefcc4aac0d64e8deeee8cdc18b9c0f AS build
 
 RUN mkdir /build
 WORKDIR /build

deploy/charts/app-orch-tenant-controller/Chart.yaml

@@ -5,8 +5,8 @@
 apiVersion: v2
 description: Tenant Controller
 name: app-orch-tenant-controller
-version: 0.3.9
+version: 0.3.10
 annotations:
   revision: ""
   created: ""
-appVersion: "0.3.9"
+appVersion: "0.3.10"

internal/plugins/harbor-provisioner.go

@@ -6,18 +6,20 @@ package plugins
 import (
 	"context"
 	"fmt"
-	"github.com/open-edge-platform/app-orch-tenant-controller/internal/southbound"
 	"strings"
 	"time"
+
+	"github.com/open-edge-platform/app-orch-tenant-controller/internal/southbound"
 )
 
 type Harbor interface {
 	Configurations(ctx context.Context) error
 	CreateProject(ctx context.Context, org string, displayName string) error
 	SetMemberPermissions(ctx context.Context, roleID int, org string, displayName string, groupName string) error
 	CreateRobot(ctx context.Context, robotName string, org string, displayName string) (string, string, error)
-	GetRobot(ctx context.Context, org string, displayName string, robotName string) (*southbound.HarborRobot, error)
-	DeleteRobot(ctx context.Context, org string, displayName string, robotID int) error
+	GetProjectID(ctx context.Context, org string, displayName string) (int, error)
+	GetRobot(ctx context.Context, org string, displayName string, robotName string, projectID int) (*southbound.HarborRobot, error)
+	DeleteRobot(ctx context.Context, robotID int) error
 	DeleteProject(ctx context.Context, org string, displayName string) error
 	Ping(ctx context.Context) error
 }
@@ -98,10 +100,14 @@ func (p *HarborProvisionerPlugin) CreateEvent(ctx context.Context, event Event,
 		return err
 	}
 
-	robot, _ := p.harbor.GetRobot(ctx, org, name, "catalog-apps-read-write")
+	projectID, err := p.harbor.GetProjectID(ctx, org, name)
+	if err != nil {
+		return err
+	}
 
+	robot, _ := p.harbor.GetRobot(ctx, org, name, "catalog-apps-read-write", projectID)
 	if robot != nil {
-		err = p.harbor.DeleteRobot(ctx, org, name, robot.ID)
+		err = p.harbor.DeleteRobot(ctx, robot.ID)
 		if err != nil {
 			return err
 		}
@@ -111,6 +117,7 @@ func (p *HarborProvisionerPlugin) CreateEvent(ctx context.Context, event Event,
 	if err != nil {
 		return err
 	}
+
 	(*pluginData)[HarborUsernameName] = name
 	(*pluginData)[HarborTokenName] = secret
 

internal/plugins/mock-clients_test.go

@@ -6,11 +6,16 @@ package plugins
 import (
 	"context"
 	"fmt"
+	"os"
+	"path/filepath"
+
 	"github.com/open-edge-platform/app-orch-tenant-controller/internal/config"
 	"github.com/open-edge-platform/app-orch-tenant-controller/internal/southbound"
 	"oras.land/oras-go/v2/content/file"
-	"os"
-	"path/filepath"
+)
+
+const (
+	HarborProjectID = 1234 // Mock project ID for testing
 )
 
 // Catalog client mock
@@ -182,6 +187,10 @@ func (t *testHarbor) Ping(_ context.Context) error {
 	return nil
 }
 
+func (t *testHarbor) GetProjectID(_ context.Context, _ string, _ string) (int, error) {
+	return HarborProjectID, nil
+}
+
 var nextRobotID = 1
 
 func (t *testHarbor) CreateRobot(_ context.Context, robotName string, org string, displayName string) (string, string, error) {
@@ -196,15 +205,18 @@ func (t *testHarbor) CreateRobot(_ context.Context, robotName string, org string
 	return "name", "secret", nil
 }
 
-func (t *testHarbor) GetRobot(_ context.Context, _ string, _ string, robotName string) (*southbound.HarborRobot, error) {
+func (t *testHarbor) GetRobot(_ context.Context, _ string, _ string, robotName string, projectID int) (*southbound.HarborRobot, error) {
+	if projectID != HarborProjectID {
+		return nil, fmt.Errorf("robot %s projectID %d not found", robotName, projectID)
+	}
 	r, ok := t.robots[robotName]
 	if !ok {
 		return nil, fmt.Errorf("robot %s not found", robotName)
 	}
 	return &southbound.HarborRobot{Name: r.robotName, ID: r.robotID}, nil
 }
 
-func (t *testHarbor) DeleteRobot(_ context.Context, _ string, _ string, robotID int) error {
+func (t *testHarbor) DeleteRobot(_ context.Context, robotID int) error {
 	for _, r := range t.robots {
 		if r.robotID == robotID {
 			delete(t.robots, r.robotName)

internal/southbound/harbor.go

@@ -216,6 +216,32 @@ func (h *HarborOCI) SetMemberPermissions(ctx context.Context, roleID int, org st
 	return nil
 }
 
+type HarborProject struct {
+	ProjectID int `json:"project_id"`
+}
+
+func (h *HarborOCI) GetProjectID(ctx context.Context, org string, displayName string) (int, error) {
+	URL := h.harborHost + "/api/v2.0/projects/" + HarborProjectName(org, displayName)
+
+	projectResults := HarborProject{}
+	resp, err := h.doHarborREST(ctx, http.MethodGet, URL, nil, AddHeaders)
+	if err != nil {
+		return 0, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		responseBody, _ := io.ReadAll(resp.Body)
+		responseJSON := string(responseBody)
+		return 0, fmt.Errorf("%s", responseJSON)
+	}
+
+	err = json.NewDecoder(resp.Body).Decode(&projectResults)
+	if err != nil {
+		return 0, err
+	}
+
+	return projectResults.ProjectID, nil
+}
+
 type RobotAccess struct {
 	Action   string `json:"action"`
 	Resource string `json:"resource"`
@@ -319,9 +345,9 @@ type HarborRobot struct {
 	UpdateTime time.Time `json:"update_time"`
 }
 
-func (h *HarborOCI) GetRobot(ctx context.Context, org string, displayName string, robotName string) (*HarborRobot, error) {
+func (h *HarborOCI) GetRobot(ctx context.Context, org string, displayName string, robotName string, projectID int) (*HarborRobot, error) {
 	robotName = fmt.Sprintf(`robot$%s+%s`, HarborProjectName(org, displayName), robotName)
-	URL := h.harborHost + "/api/v2.0/projects/" + HarborProjectName(org, displayName) + "/robots"
+	URL := h.harborHost + "/api/v2.0/robots?q=Level=project,ProjectID=" + fmt.Sprintf("%d", projectID)
 
 	robotsResults := []HarborRobot{}
 	resp, err := h.doHarborREST(ctx, http.MethodGet, URL, nil, AddHeaders)
@@ -349,8 +375,8 @@ func (h *HarborOCI) GetRobot(ctx context.Context, org string, displayName string
 	return nil, fmt.Errorf("harbor robot %s not found", robotName)
 }
 
-func (h *HarborOCI) DeleteRobot(ctx context.Context, org string, displayName string, robotID int) error {
-	URL := fmt.Sprintf("%s/api/v2.0/projects/%s/robots/%d", h.harborHost, HarborProjectName(org, displayName), robotID)
+func (h *HarborOCI) DeleteRobot(ctx context.Context, robotID int) error {
+	URL := fmt.Sprintf("%s/api/v2.0/robots/%d", h.harborHost, robotID)
 	resp, err := h.doHarborREST(ctx, http.MethodDelete, URL, nil, AddHeaders)
 	if err != nil {
 		return err

internal/southbound/harbor_test.go

@@ -7,14 +7,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/stretchr/testify/suite"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/suite"
 )
 
 // Suite of harbor southbound tests
@@ -132,6 +133,10 @@ func projectHandler(w http.ResponseWriter, r *http.Request) {
 	} else if r.Method == http.MethodDelete &&
 		strings.Contains(r.URL.Path, `catalog-apps-org-new-project`) {
 		w.WriteHeader(http.StatusOK)
+	} else if r.Method == http.MethodGet {
+		w.WriteHeader(http.StatusOK)
+		projectResults := HarborProject{ProjectID: 0}
+		_ = json.NewEncoder(w).Encode(projectResults)
 	} else {
 		w.WriteHeader(http.StatusBadRequest)
 	}
@@ -281,16 +286,19 @@ func (s *HarborTestSuite) TestHarborCreateRobot() {
 	s.Len(mockRobots, 1)
 	s.Equal(mockRobots[name].Name, name)
 
-	robot, err := h.GetRobot(s.ctx, "org", "new-project", "new-robot")
+	projectID, err := h.GetProjectID(s.ctx, "org", "new-project")
+	s.NoError(err)
+
+	robot, err := h.GetRobot(s.ctx, "org", "new-project", "new-robot", projectID)
 	s.NoError(err)
 	s.NotNil(robot)
 	s.Equal("robot$catalog-apps-org-new-project+new-robot", robot.Name)
 
-	err = h.DeleteRobot(s.ctx, "org", "new-project", robot.ID)
+	err = h.DeleteRobot(s.ctx, robot.ID)
 	s.NoError(err)
 	s.Len(mockRobots, 0)
 
-	robot, err = h.GetRobot(s.ctx, "org", "new-project", "new-robot")
+	robot, err = h.GetRobot(s.ctx, "org", "new-project", "new-robot", projectID)
 	s.Error(err)
 	s.Nil(robot)
 }