Merge pull request #89 from chainguard-dev/create-pull-request/patch

Export mono/sdk: refs/heads/main

Author: k4leung4

.github/workflows/test.yaml

@@ -35,7 +35,7 @@ jobs:
             ${{ runner.os }}-go-
 
       - name: Set up Go
-        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
           go-version-file: './go.mod'
           check-latest: true

.github/workflows/verify.yaml

@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
           go-version-file: './src/github.com/${{ github.repository }}/go.mod'
           check-latest: true

proto/capabilities/capabilities.pb.go

@@ -98,9 +98,8 @@ enum Capability {
 
   // Registry
 
-  // TODO(jason): Remove these coarse-grained capabilities after they're removed from the roles.
-  CAP_REGISTRY_PULL = 1601 [(name) = "registry.pull", (bit) = 40, deprecated = true]; // Can read tags, blobs, manifests.
-  CAP_REGISTRY_PUSH = 1602 [(name) = "registry.push", (bit) = 41, deprecated = true]; // Can create and update tags, blobs, manifests.
+  reserved 1601; // CAP_REGISTRY_PULL
+  reserved 1602; // CAP_REGISTRY_PUSH
 
   CAP_REPO_CREATE = 1603 [(name) = "repo.create", (bit) = 56];
   CAP_REPO_UPDATE = 1604 [(name) = "repo.update", (bit) = 57];

proto/capabilities/capabilities.proto

@@ -619,6 +619,8 @@ message ImageConfigRequest {
   string digest = 2;
   // The architecture to get config for.
   string arch = 3;
+  // Fetch config from registry.
+  bool registry = 4;
 }
 
 message RawSbomRequest {

proto/platform/registry/v1/registry.platform.pb.go

@@ -7,21 +7,49 @@ package test
 
 import (
 	"context"
+	"fmt"
 
 	registry "chainguard.dev/sdk/proto/platform/registry/v1"
+	"github.com/google/go-cmp/cmp"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/testing/protocmp"
 )
 
 var _ registry.EntitlementsClient = (*MockEntitlementsClient)(nil)
 
-type MockEntitlementsClient struct{}
+type MockEntitlementsClient struct {
+	registry.EntitlementsClient
 
-func (*MockEntitlementsClient) ListEntitlements(context.Context, *registry.EntitlementFilter, ...grpc.CallOption) (*registry.EntitlementList, error) {
-	return nil, status.Error(codes.Unimplemented, "not implemented")
+	OnListEntitlements      []ListOnEntitlements
+	OnListEntitlementImages []ListOnEntitlementImages
 }
 
-func (*MockEntitlementsClient) ListEntitlementImages(context.Context, *registry.EntitlementImagesFilter, ...grpc.CallOption) (*registry.EntitlementImagesList, error) {
-	return nil, status.Error(codes.Unimplemented, "not implemented")
+type ListOnEntitlements struct {
+	Given *registry.EntitlementFilter
+	List  *registry.EntitlementList
+	Error error
+}
+
+type ListOnEntitlementImages struct {
+	Given *registry.EntitlementImagesFilter
+	List  *registry.EntitlementImagesList
+	Error error
+}
+
+func (m *MockEntitlementsClient) ListEntitlements(_ context.Context, given *registry.EntitlementFilter, _ ...grpc.CallOption) (*registry.EntitlementList, error) {
+	for _, o := range m.OnListEntitlements {
+		if cmp.Equal(o.Given, given, protocmp.Transform()) {
+			return o.List, o.Error
+		}
+	}
+	return nil, fmt.Errorf("mock not found for %v", given)
+}
+
+func (m *MockEntitlementsClient) ListEntitlementImages(_ context.Context, given *registry.EntitlementImagesFilter, _ ...grpc.CallOption) (*registry.EntitlementImagesList, error) {
+	for _, o := range m.OnListEntitlementImages {
+		if cmp.Equal(o.Given, given, protocmp.Transform()) {
+			return o.List, o.Error
+		}
+	}
+	return nil, fmt.Errorf("mock not found for %v", given)
 }

proto/platform/registry/v1/registry.platform.proto

@@ -69,6 +69,9 @@ type MockRegistryClient struct {
 	OnGetRawSbom                []RawSbomOnGet
 	OnGetPackageVersionMetadata []PackageVersionMetadataOnGet
 	OnListBuildReports          []BuildReportsOnList
+	OnGetRepoCountBySource      []RepoCountBySourceOnGet
+	OnGetArchs                  []ArchsOnGet
+	OnGetSize                   []SizeOnGet
 }
 
 type ReposOnCreate struct {
@@ -165,6 +168,24 @@ type BuildReportsOnList struct {
 	Error error
 }
 
+type RepoCountBySourceOnGet struct {
+	Given *registry.GetRepoCountBySourceRequest
+	Get   *registry.RepoCount
+	Error error
+}
+
+type ArchsOnGet struct {
+	Given *registry.ArchRequest
+	Get   *registry.Archs
+	Error error
+}
+
+type SizeOnGet struct {
+	Given *registry.SizeRequest
+	Get   *registry.Size
+	Error error
+}
+
 func (m MockRegistryClient) CreateRepo(_ context.Context, given *registry.CreateRepoRequest, _ ...grpc.CallOption) (*registry.Repo, error) {
 	for _, o := range m.OnCreateRepos {
 		if cmp.Equal(o.Given, given, protocmp.Transform()) {
@@ -308,3 +329,30 @@ func (m MockRegistryClient) ListBuildReports(_ context.Context, given *registry.
 	}
 	return nil, fmt.Errorf("mock not found for %v", given)
 }
+
+func (m MockRegistryClient) GetRepoCountBySource(_ context.Context, given *registry.GetRepoCountBySourceRequest, _ ...grpc.CallOption) (*registry.RepoCount, error) {
+	for _, o := range m.OnGetRepoCountBySource {
+		if cmp.Equal(o.Given, given, protocmp.Transform()) {
+			return o.Get, o.Error
+		}
+	}
+	return nil, fmt.Errorf("mock not found for %v", given)
+}
+
+func (m MockRegistryClient) GetArchs(_ context.Context, given *registry.ArchRequest, _ ...grpc.CallOption) (*registry.Archs, error) {
+	for _, o := range m.OnGetArchs {
+		if cmp.Equal(o.Given, given, protocmp.Transform()) {
+			return o.Get, o.Error
+		}
+	}
+	return nil, fmt.Errorf("mock not found for %v", given)
+}
+
+func (m MockRegistryClient) GetSize(_ context.Context, given *registry.SizeRequest, _ ...grpc.CallOption) (*registry.Size, error) {
+	for _, o := range m.OnGetSize {
+		if cmp.Equal(o.Given, given, protocmp.Transform()) {
+			return o.Get, o.Error
+		}
+	}
+	return nil, fmt.Errorf("mock not found for %v", given)
+}