diff --git a/pkg/auth/login/html.go b/pkg/auth/login/html.go index 664d900..0659f5d 100644 --- a/pkg/auth/login/html.go +++ b/pkg/auth/login/html.go @@ -5,8 +5,8 @@ SPDX-License-Identifier: Apache-2.0 package login -const ( - HTMLAuthSucessful = ` +var ( + HTMLAuthSuccessful = ` Chainguard Authentication @@ -51,8 +51,8 @@ const (
- chainctl - authentication successful! + + authentication successful!
You may now close @@ -61,7 +61,7 @@ const (
- chainctl documentation +
diff --git a/pkg/auth/login/server.go b/pkg/auth/login/server.go index a38fed0..b82c82f 100644 --- a/pkg/auth/login/server.go +++ b/pkg/auth/login/server.go @@ -54,7 +54,7 @@ func newServer(ctx context.Context) (*server, error) { func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) { switch r.URL.Path { case "/": - fmt.Fprint(w, HTMLAuthSucessful) + fmt.Fprint(w, HTMLAuthSuccessful) close(s.token) return diff --git a/pkg/auth/token/token.go b/pkg/auth/token/token.go index 05e6ba3..740c27c 100644 --- a/pkg/auth/token/token.go +++ b/pkg/auth/token/token.go @@ -80,11 +80,9 @@ func DeleteAll() error { // // $ tree ~/Library/Caches/chainguard // /Users/foo/Library/Caches/chainguard - // ├── https:--console-api.chainops.dev - // │ └── oidc-token // ├── https:--console-api.enforce.dev // │ └── oidc-token - // ├── https:--console-api.test-env.dev + // ├── https:--cgr.dev // └── oidc-token for _, file := range files { if !file.IsDir() { diff --git a/pkg/validation/enforcer_options.go b/pkg/validation/enforcer_options.go index 90f11e9..2b56bb9 100644 --- a/pkg/validation/enforcer_options.go +++ b/pkg/validation/enforcer_options.go @@ -19,9 +19,9 @@ const ( ) var ( - // Valid webhook label selection options for a managed cluster + // ValidNamespaceEnforcementModeOpts are valid webhook label selection options for a managed cluster ValidNamespaceEnforcementModeOpts = sets.NewString(NamespaceEnforcementModeOptIn, NamespaceEnforcementModeOptOut) - // Valid enforcer options available field names + // ValidEnforcerOptions are valid field names of enforcer options available ValidEnforcerOptions = sets.NewString(EnforcerOptionWebhookFailOpen, EnforcerOptionEnableCIPCache, EnforcerOptionNamespaceEnforcementMode) ) diff --git a/proto/capabilities/capabilities.go b/proto/capabilities/capabilities.go index 2898851..b0876bd 100644 --- a/proto/capabilities/capabilities.go +++ b/proto/capabilities/capabilities.go @@ -12,7 +12,7 @@ import ( "io" "sort" "strings" - sync "sync" + "sync" "github.com/bits-and-blooms/bitset" "go.uber.org/zap" diff --git a/proto/platform/tenant/v1/attestation.platform.pb.go b/proto/platform/tenant/v1/attestation.platform.pb.go index f1bd326..52bae51 100644 --- a/proto/platform/tenant/v1/attestation.platform.pb.go +++ b/proto/platform/tenant/v1/attestation.platform.pb.go @@ -32,15 +32,18 @@ type Attestation struct { unknownFields protoimpl.UnknownFields // id, The Attestation UIDP at which this Attestation resides in the hierarchy. - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + // raw_attestation is a free form type to stub in any attestations so we don't end up a + // adding new tables for all the new type of attestations, initial goal is to add image configs + // and anything which comes up after that RawAttestation []byte `protobuf:"bytes,2,opt,name=raw_attestation,json=rawAttestation,proto3" json:"raw_attestation,omitempty"` - // format holds whether the Document format type + // format holds the Document format type Format string `protobuf:"bytes,3,opt,name=format,proto3" json:"format,omitempty"` // generated_at holds when the Attestation was generated. GeneratedAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=generated_at,json=generatedAt,proto3" json:"generated_at,omitempty"` // Name of the Attestation. Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` - // Short description of the Attesation + // Short description of the Attestation Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"` // digest of the Attestation when ingested Digest *string `protobuf:"bytes,7,opt,name=digest,proto3,oneof" json:"digest,omitempty"` diff --git a/proto/platform/tenant/v1/attestation.platform.proto b/proto/platform/tenant/v1/attestation.platform.proto index 55678e2..652a67f 100644 --- a/proto/platform/tenant/v1/attestation.platform.proto +++ b/proto/platform/tenant/v1/attestation.platform.proto @@ -28,21 +28,22 @@ service Attestations { message Attestation { // id, The Attestation UIDP at which this Attestation resides in the hierarchy. string id = 1; - // raw_attestation is a free form typr to stub in any attesations so we don't end up a - // adding new tables for all the new type of attesations , initial goal is to add image configs a - // and anything which comes up after that + // raw_attestation is a free form type to stub in any attestations so we don't end up a + // adding new tables for all the new type of attestations, initial goal is to add image configs + // and anything which comes up after that bytes raw_attestation = 2; - // format holds whether the Document format type + // format holds the Document format type string format = 3; + // generated_at holds when the Attestation was generated. google.protobuf.Timestamp generated_at = 4; // Name of the Attestation. string name = 5; - // Short description of the Attesation + // Short description of the Attestation string description = 6; // digest of the Attestation when ingested diff --git a/proto/platform/tenant/v1/context.platform.pb.go b/proto/platform/tenant/v1/context.platform.pb.go index 6f0c312..e909684 100644 --- a/proto/platform/tenant/v1/context.platform.pb.go +++ b/proto/platform/tenant/v1/context.platform.pb.go @@ -470,7 +470,7 @@ func (x *RecordContext_Workload) GetRemoteId() string { // Ancestry relationships are added to records when a "base image" // relationship has been uncovered. This context is added to BOTH // records with their respective roles. The base image will get -// the Role BASE, and the derivative image will get the Rile DERIVED. +// the Role BASE, and the derivative image will get the Role DERIVED. type RecordContext_Ancestry struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -536,7 +536,7 @@ func (x *RecordContext_Ancestry) GetImageId() string { // index. The INDEX will typically contain N contexts carrying the Role // INDEX, the id of the VARIANT's record, and the version information // that discriminates that VARIANT from other VARIANTs. The VARIANT -// will typically (but not always!) contain 1 context varrying the Role +// will typically (but not always!) contain 1 context carrying the Role // VARIANT, the id of the INDEX's record, and the version information // that discriminates it among the other VARIANTs in the INDEX. type RecordContext_Variant struct { diff --git a/proto/platform/tenant/v1/context.platform.proto b/proto/platform/tenant/v1/context.platform.proto index fc012cf..b16427b 100644 --- a/proto/platform/tenant/v1/context.platform.proto +++ b/proto/platform/tenant/v1/context.platform.proto @@ -52,7 +52,7 @@ message RecordContext { // Ancestry relationships are added to records when a "base image" // relationship has been uncovered. This context is added to BOTH // records with their respective roles. The base image will get - // the Role BASE, and the derivative image will get the Rile DERIVED. + // the Role BASE, and the derivative image will get the Role DERIVED. message Ancestry { Role role = 1; @@ -75,7 +75,7 @@ message RecordContext { // index. The INDEX will typically contain N contexts carrying the Role // INDEX, the id of the VARIANT's record, and the version information // that discriminates that VARIANT from other VARIANTs. The VARIANT - // will typically (but not always!) contain 1 context varrying the Role + // will typically (but not always!) contain 1 context carrying the Role // VARIANT, the id of the INDEX's record, and the version information // that discriminates it among the other VARIANTs in the INDEX. message Variant {