More trust store types

.github/workflows/build-pr.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Check build
         run: bin/ratify version
       - name: Upload coverage to codecov.io
-        uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+        uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
       - name: Run helm lint
         run: helm lint charts/ratify
 
@@ -75,7 +75,7 @@ jobs:
           make install ratify-config install-bats
           make test-e2e-cli LOCAL_REGISTRY_IMAGE=registry GOCOVERDIR=${GITHUB_WORKSPACE}/test/e2e/.cover
       - name: Upload coverage to codecov.io
-        uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+        uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
 
   build_test_e2e:
     name: "Build and run e2e Test"

Makefile

@@ -553,7 +553,7 @@ e2e-helm-deploy-ratify-without-tls-certs:
 	--set image.tag=test \
 	--set gatekeeper.version=${GATEKEEPER_VERSION} \
 	--set featureFlags.RATIFY_CERT_ROTATION=${CERT_ROTATION_ENABLED} \
-	--set notaryCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
+	--set notationCerts[0]="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
 	--set cosign.key="$$(cat .staging/cosign/cosign.pub)" \
 	--set oras.useHttp=true \
 	--set-file dockerConfig="mount_config.json" \

api/unversioned/store_types.go

@@ -28,6 +28,8 @@ type StoreSpec struct {
 
 	// Name of the store
 	Name string `json:"name,omitempty"`
+	// Version of the store plugin. Optional
+	Version string `json:"version,omitempty"`
 	// Plugin path, optional
 	Address string `json:"address,omitempty"`
 	// OCI Artifact source to download the plugin from, optional
@@ -40,6 +42,15 @@ type StoreSpec struct {
 // StoreStatus defines the observed state of Store
 type StoreStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
+
+	// Is successful in finding the plugin
+	IsSuccess bool `json:"issuccess"`
+	// Error message if operation was unsuccessful
+	// +optional
+	Error string `json:"error,omitempty"`
+	// Truncated error message if the message is too long
+	// +optional
+	BriefError string `json:"brieferror,omitempty"`
 }
 
 // Store is the Schema for the stores API

api/unversioned/verifier_types.go

@@ -29,6 +29,9 @@ type VerifierSpec struct {
 	// Name of the verifier
 	Name string `json:"name,omitempty"`
 
+	// Version of the verifier plugin. Optional
+	Version string `json:"version,omitempty"`
+
 	// The type of artifact this verifier handles
 	ArtifactTypes string `json:"artifactTypes,omitempty"`
 
@@ -46,6 +49,15 @@ type VerifierSpec struct {
 type VerifierStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+
+	// Is successful in finding the plugin
+	IsSuccess bool `json:"issuccess"`
+	// Error message if operation was unsuccessful
+	// +optional
+	Error string `json:"error,omitempty"`
+	// Truncated error message if the message is too long
+	// +optional
+	BriefError string `json:"brieferror,omitempty"`
 }
 
 // Verifier is the Schema for the verifiers API

api/v1alpha1/store_conversion.go

@@ -0,0 +1,37 @@
+/*
+Copyright The Ratify 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 v1alpha1
+
+import (
+	unversioned "github.com/deislabs/ratify/api/unversioned"
+	conversion "k8s.io/apimachinery/pkg/conversion"
+)
+
+// Convert unversioned StoreStatus to StoreStatus of v1alpha1.
+//
+//nolint:revive
+func Convert_unversioned_StoreStatus_To_v1alpha1_StoreStatus(in *unversioned.StoreStatus, out *StoreStatus, _ conversion.Scope) error {
+	return nil
+}
+
+// Convert unversioned StoreSpec to VerifieStoreSpecrSpec of v1alpha1.
+//
+//nolint:revive
+func Convert_unversioned_StoreSpec_To_v1alpha1_StoreSpec(spec *unversioned.StoreSpec, out *StoreSpec, _ conversion.Scope) error {
+	out.Parameters = spec.Parameters
+	return nil
+}

api/v1alpha1/verifier_conversion.go

@@ -0,0 +1,37 @@
+/*
+Copyright The Ratify 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 v1alpha1
+
+import (
+	unversioned "github.com/deislabs/ratify/api/unversioned"
+	conversion "k8s.io/apimachinery/pkg/conversion"
+)
+
+// Convert unversioned VerifierStatus to VerifierStatus of v1alpha1.
+//
+//nolint:revive
+func Convert_unversioned_VerifierStatus_To_v1alpha1_VerifierStatus(status *unversioned.VerifierStatus, out *VerifierStatus, _ conversion.Scope) error {
+	return nil
+}
+
+// Convert unversioned VerifierSpec to VerifierSpec of v1alpha1.
+//
+//nolint:revive
+func Convert_unversioned_VerifierSpec_To_v1alpha1_VerifierSpec(spec *unversioned.VerifierSpec, out *VerifierSpec, _ conversion.Scope) error {
+	out.Parameters = spec.Parameters
+	return nil
+}