fix tests

ottogroup · Apr 16, 2024 · cea847c · cea847c
1 parent 44f193a
commit cea847c
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 23 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -44,10 +44,10 @@ jobs:
       - name: DB Migration
         run: flyway migrate -url=jdbc:postgresql://$POSTGRES_HOST:$POSTGRES_PORT/$POSTGRES_DB -user=$POSTGRES_USER -password=$POSTGRES_PASSWORD -locations=filesystem:./resources/migrations
 
-      - name: Set up Go ^1.21
-        uses: actions/setup-go@v4
+      - name: Set up Go ^1.22
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
 
       - name: Get dependencies
         run: go get -v -t -d ./...

diff --git a/frontend/index.html b/frontend/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="icon" href="/favicon.png" />
+    <link rel="icon" href="/penelope_48.png" />
     <title>Penelope</title>
   </head>
 

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import logo from "@/assets/penelope_32.png";
+import logo from "@/assets/penelope_48.png";
 import Sandbox from "@/views/Sandbox.vue";
 import { ref } from "vue";
 
@@ -25,6 +25,7 @@ document.title = title.value;
             <v-img :src="logo" />
           </v-avatar>
         </router-link>
+        &nbsp;
         {{ title }}
       </template>
 

diff --git a/pkg/http/rest/api_test.go b/pkg/http/rest/api_test.go
@@ -21,11 +21,30 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func createBuilder(backupProvider provider.SinkGCPProjectProvider, tokenSourceProvider impersonate.TargetPrincipalForProjectProvider, credentialProvider secret.SecretProvider) *builder.ProcessorBuilder {
+type mockSourceGCPProjectProvider struct {
+	Error             error
+	AvailabilityClass provider.AvailabilityClass
+	DataOwner         string
+}
+
+var mockSourceTokenProvider = &mockSourceGCPProjectProvider{
+	Error:             nil,
+	AvailabilityClass: provider.A2Aimed,
+	DataOwner:         "john.doe",
+}
+
+func (m *mockSourceGCPProjectProvider) GetSourceGCPProject(ctxIn context.Context, gcpProjectID string) (provider.SourceGCPProject, error) {
+	return provider.SourceGCPProject{
+		AvailabilityClass: m.AvailabilityClass,
+		DataOwner:         m.DataOwner,
+	}, m.Error
+}
+
+func createBuilder(backupProvider provider.SinkGCPProjectProvider, tokenSourceProvider impersonate.TargetPrincipalForProjectProvider, credentialProvider secret.SecretProvider, sourceGCPProjectProvider provider.SourceGCPProjectProvider) *builder.ProcessorBuilder {
 	return builder.NewProcessorBuilder(
-		processor.NewCreatingProcessorFactory(backupProvider, tokenSourceProvider, credentialProvider),
-		processor.NewGettingProcessorFactory(tokenSourceProvider, credentialProvider),
-		processor.NewListingProcessorFactory(tokenSourceProvider, credentialProvider),
+		processor.NewCreatingProcessorFactory(backupProvider, tokenSourceProvider, credentialProvider, sourceGCPProjectProvider),
+		processor.NewGettingProcessorFactory(tokenSourceProvider, credentialProvider, sourceGCPProjectProvider),
+		processor.NewListingProcessorFactory(tokenSourceProvider, credentialProvider, sourceGCPProjectProvider),
 		processor.NewUpdatingProcessorFactory(tokenSourceProvider, credentialProvider),
 		nil,
 		nil,

diff --git a/pkg/http/rest/creating_roundtripped_test.go b/pkg/http/rest/creating_roundtripped_test.go
@@ -18,14 +18,14 @@ import (
 	"testing"
 )
 
-func restAPIFactoryWithRealFactory(t *testing.T, principalRoleBindings []model.ProjectRoleBinding, backupProvider provider.SinkGCPProjectProvider, tokenSourceProvider impersonate.TargetPrincipalForProjectProvider) *httptest.Server {
+func restAPIFactoryWithRealFactory(t *testing.T, principalRoleBindings []model.ProjectRoleBinding, backupProvider provider.SinkGCPProjectProvider, tokenSourceProvider impersonate.TargetPrincipalForProjectProvider, sourceGCPProjectProvider provider.SourceGCPProjectProvider) *httptest.Server {
 	emptyTokenValidator := auth.NewEmptyTokenValidator()
 	authenticationMiddleware, err := auth.NewAuthenticationMiddleware(emptyTokenValidator, givenDefaultPrincipalRetrieverWithRoles(principalRoleBindings))
 	if err != nil {
 		t.Error("expected", "instance of AuthenticationMiddleware can be created", "got", fmt.Sprintf("error: %s", err))
 		os.Exit(1)
 	}
-	app := NewRestAPI(createBuilder(backupProvider, tokenSourceProvider, secret.NewEnvSecretProvider()), authenticationMiddleware, nil, secret.NewEnvSecretProvider())
+	app := NewRestAPI(createBuilder(backupProvider, tokenSourceProvider, secret.NewEnvSecretProvider(), sourceGCPProjectProvider), authenticationMiddleware, nil, secret.NewEnvSecretProvider())
 	return httptest.NewServer(authenticationMiddleware.AddAuthentication(app.ServeHTTP))
 }
 
@@ -46,7 +46,7 @@ func TestCreateSnapshotRequestOneShot(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Owner,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, tokenConfigProvider)
+	}}, mockBackupProvider, tokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 	httpMockHandler.RegisterLocalServer(s.URL)
 
@@ -97,7 +97,7 @@ func TestCreateSnapshotRequest_WithTTL(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Owner,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 	httpMockHandler.RegisterLocalServer(s.URL)
 
@@ -156,7 +156,7 @@ func TestCreateSnapshotRequestOneShot_DatasetNotExisting(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Owner,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 	httpMockHandler.RegisterLocalServer(s.URL)
 
@@ -198,7 +198,7 @@ func TestCreateSnapshotRequestOneShot_InsufficientPermissions(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Viewer,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 	httpMockHandler.RegisterLocalServer(s.URL)
 

diff --git a/pkg/http/rest/deleting_test.go b/pkg/http/rest/deleting_test.go
@@ -31,7 +31,7 @@ func TestDeleting_WithNonExistingBackup(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Viewer,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 
 	httpMockHandler.RegisterLocalServer(s.URL)
@@ -75,7 +75,7 @@ func TestDeleting_WithScheduledBackup(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Owner,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 	httpMockHandler.RegisterLocalServer(s.URL)
 
@@ -109,7 +109,7 @@ func TestDeleting_WithNotScheduledBackup(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Owner,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 	httpMockHandler.RegisterLocalServer(s.URL)
 

diff --git a/pkg/http/rest/getting_test.go b/pkg/http/rest/getting_test.go
@@ -30,7 +30,7 @@ func TestGetting_WithUnknownResponse(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Viewer,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 
 	httpMockHandler.RegisterLocalServer(s.URL)
@@ -57,7 +57,7 @@ func TestGetting_WithKnownResponse(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Viewer,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 
 	httpMockHandler.RegisterLocalServer(s.URL)

diff --git a/pkg/http/rest/listing_test.go b/pkg/http/rest/listing_test.go
@@ -31,7 +31,7 @@ func TestListing_WithEmptyResponse(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Viewer,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 
 	httpMockHandler.RegisterLocalServer(s.URL)
@@ -85,7 +85,7 @@ func TestListing_WithSingleResponse(t *testing.T) {
 	s := restAPIFactoryWithRealFactory(t, []model.ProjectRoleBinding{{
 		Role:    model.Viewer,
 		Project: defaultProjectID,
-	}}, mockBackupProvider, mockTokenConfigProvider)
+	}}, mockBackupProvider, mockTokenConfigProvider, mockSourceTokenProvider)
 	defer s.Close()
 	httpMockHandler.RegisterLocalServer(s.URL)
 

diff --git a/pkg/processor/getting_test.go b/pkg/processor/getting_test.go
@@ -2,6 +2,7 @@ package processor
 
 import (
 	"encoding/json"
+	"github.com/ottogroup/penelope/pkg/provider"
 	"testing"
 
 	"github.com/ottogroup/penelope/pkg/repository"
@@ -12,7 +13,7 @@ func Test_MakeResponseForArchiveTTM(t *testing.T) {
 	backup := repository.Backup{
 		SinkOptions: repository.SinkOptions{ArchiveTTM: 123},
 	}
-	backupResponse := mapBackupToResponse(&backup, []*repository.Job{})
+	backupResponse := mapBackupToResponse(&backup, []*repository.Job{}, provider.SourceGCPProject{})
 	assert.Equal(t, backupResponse.TargetOptions.ArchiveTTM, backup.ArchiveTTM)
 	body, err := json.Marshal(&backupResponse)
 	assert.Nil(t, err, "expected no error")