Merge remote-tracking branch 'origin/main' into jiparis/ai-agent-config-kind

Author: jiparis

.chainloop.yml

@@ -1,6 +1,6 @@
 # This indicates the [current version]+next
 # to indicate that we are building a new version of the project
-projectVersion: v1.82.0+next
+projectVersion: v1.82.1+next
 
 # Experimental feature used by Chainloop labs shared workflow https://github.com/chainloop-dev/labs
 # It maps the material names with location in disk so they get automatically attested

app/artifact-cas/configs/config.devel.yaml

@@ -8,6 +8,9 @@ server:
     # Timeouts for http downloads
     # grpc downloads/uploads don't require this because they don't have timeouts
     timeout: 300s
+    # cors:
+    #   allow_origins:
+    #     - "http://localhost:3000"
   grpc:
     addr: 0.0.0.0:9001
     # Some unary RPCs are slow, so we need to increase the timeout
@@ -18,9 +21,6 @@ server:
     #   private_key: "../../devel/devkeys/selfsigned/cas.key"
   http_metrics:
     addr: 0.0.0.0:5001
-  # cors:
-  #   allow_origins:
-  #     - "http://localhost:3000"
 
 credentials_service:
   # we will check that we can read there

app/artifact-cas/internal/conf/conf.pb.go

@@ -38,13 +38,15 @@ message Bootstrap {
 }
 
 message Server {
+  message CORS {
+    repeated string allow_origins = 1;
+  }
   message HTTP {
     string network = 1;
     string addr = 2;
     google.protobuf.Duration timeout = 3;
-  }
-  message CORS {
-    repeated string allow_origins = 1;
+    // CORS configuration for the HTTP download endpoint
+    CORS cors = 4;
   }
   message TLS {
     // path to certificate and private key
@@ -63,8 +65,6 @@ message Server {
   GRPC grpc = 2;
   // hHTTP server where the prometheus metrics will get exposed
   HTTP http_metrics = 3;
-  // CORS configuration for the HTTP download endpoint
-  CORS cors = 4;
 }
 
 message Auth {

app/artifact-cas/internal/conf/conf.proto

@@ -66,7 +66,7 @@ func NewHTTPServer(c *conf.Server, authConf *conf.Auth, downloadSvc *service.Dow
 	srv := http.NewServer(opts...)
 
 	downloadHandler := middlewares_http.AuthFromQueryParam(loadPublicKey(rawKey), claimsFunc(), casJWT.SigningMethod, downloadSvc)
-	srv.Handle(service.DownloadPath, CORSMiddleware(c.GetCors().GetAllowOrigins(), downloadHandler))
+	srv.Handle(service.DownloadPath, CORSMiddleware(c.GetHttp().GetCors().GetAllowOrigins(), downloadHandler))
 	api.RegisterStatusServiceHTTPServer(srv, service.NewStatusService(Version, providers))
 	return srv, nil
 }

app/artifact-cas/internal/server/http.go

@@ -31,6 +31,9 @@ modules:
       except:
         - EXTENSION_NO_DELETE
         - FIELD_SAME_DEFAULT
+      ignore_only:
+        FIELD_NO_DELETE:
+          - app/artifact-cas/internal/conf/conf.proto
   - path: app/controlplane/api
     lint:
       use:

buf.yaml

@@ -7,9 +7,9 @@ description: Chainloop is an open source software supply chain control plane, a
 
 type: application
 # Bump the patch (not minor, not major) version on each change in the Chart Source code
-version: 1.343.0
+version: 1.344.0
 # Do not update appVersion, this is handled automatically by the release process
-appVersion: v1.82.0
+appVersion: v1.82.1
 
 dependencies:
   - name: common
@@ -33,11 +33,11 @@ dependencies:
 
 annotations:
     images: |
-        - image: ghcr.io/chainloop-dev/chainloop/artifact-cas:v1.82.0
+        - image: ghcr.io/chainloop-dev/chainloop/artifact-cas:v1.82.1
           name: artifact-cas
-        - image: ghcr.io/chainloop-dev/chainloop/control-plane:v1.82.0
+        - image: ghcr.io/chainloop-dev/chainloop/control-plane:v1.82.1
           name: control-plane
-        - image: ghcr.io/chainloop-dev/chainloop/control-plane-migrations:v1.82.0
+        - image: ghcr.io/chainloop-dev/chainloop/control-plane-migrations:v1.82.1
           name: control-plane-migrations
-        - image: ghcr.io/chainloop-dev/chainloop/cli:v1.82.0
+        - image: ghcr.io/chainloop-dev/chainloop/cli:v1.82.1
           name: cli

deployment/chainloop/Chart.yaml

@@ -20,6 +20,21 @@ data:
         # Timeouts for http downloads
         # grpc downloads/uploads don't require this because they don't have timeouts
         timeout: 300s
+        {{- if .Values.cas.allowedOrigins }}
+        cors:
+          allow_origins:
+            {{- if kindIs "string" .Values.cas.allowedOrigins }}
+            {{- range splitList "," .Values.cas.allowedOrigins }}
+            {{- if (trim .) }}
+            - {{ trim . | quote }}
+            {{- end }}
+            {{- end }}
+            {{- else }}
+            {{- range .Values.cas.allowedOrigins }}
+            - {{ . | quote }}
+            {{- end }}
+            {{- end }}
+        {{- end }}
       grpc:
         {{- if include "cas.tls-secret-name" .  }}
         tls_config:
@@ -31,18 +46,3 @@ data:
         timeout: 5s
       http_metrics:
         addr: "0.0.0.0:{{ .Values.cas.containerPorts.metrics}}"
-      {{- if .Values.cas.allowedOrigins }}
-      cors:
-        allow_origins:
-          {{- if kindIs "string" .Values.cas.allowedOrigins }}
-          {{- range splitList "," .Values.cas.allowedOrigins }}
-          {{- if (trim .) }}
-          - {{ trim . | quote }}
-          {{- end }}
-          {{- end }}
-          {{- else }}
-          {{- range .Values.cas.allowedOrigins }}
-          - {{ . | quote }}
-          {{- end }}
-          {{- end }}
-      {{- end }}

deployment/chainloop/templates/cas/configmap.yaml

@@ -138,7 +138,7 @@ controlplane:
   image:
     registry: ghcr.io
     repository: chainloop-dev/chainloop/control-plane
-    tag: "v1.82.0"
+    tag: "v1.82.1"
 
 
   ## @param controlplane.containerPorts.http controlplane HTTP container port
@@ -219,7 +219,7 @@ controlplane:
     image:
       registry: ghcr.io
       repository: chainloop-dev/chainloop/control-plane-migrations
-      tag: "v1.82.0"
+      tag: "v1.82.1"
     # Run the migration job forcing SSL, required in AWS RDS for PostgreSQL 15
     ssl: false
 
@@ -1007,7 +1007,7 @@ cas:
   image:
     registry: ghcr.io
     repository: chainloop-dev/chainloop/artifact-cas
-    tag: "v1.82.0"
+    tag: "v1.82.1"
 
   ## @param cas.containerPorts.http controlplane HTTP container port
   ## @param cas.containerPorts.grpc controlplane gRPC container port