Skip to content

Commit

Permalink
remove internal refs and tidy up (#33)
Browse files Browse the repository at this point in the history
* remove refs to chainops and internal dev env; typos

---------

Signed-off-by: Colin Douglas <[email protected]>
  • Loading branch information
cmdpdx authored Nov 13, 2023
1 parent 065469c commit 2407796
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 24 deletions.
10 changes: 5 additions & 5 deletions pkg/auth/login/html.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ SPDX-License-Identifier: Apache-2.0

package login

const (
HTMLAuthSucessful = `<!DOCTYPE html>
var (
HTMLAuthSuccessful = `<!DOCTYPE html>
<html>
<head>
<title>Chainguard Authentication</title>
Expand Down Expand Up @@ -51,8 +51,8 @@ const (
</a>
<div class="container">
<div class="title">
<span class="chainctl">chainctl </span>
<span>authentication successful!</span>
<span class="logo">Chainguard</span>
<span> authentication successful!</span>
</div>
<div class="content">
<span>You may now close </span>
Expand All @@ -61,7 +61,7 @@ const (
</div>
<div class="links if-online">
<a href="https://console.enforce.dev" class="link login"><span class="logo">Chainguard Console</span></a>
<a href="https://go.chainguard.dev/chainctl-docs" class="link"><span class="chainctl">chainctl</span> documentation</a>
<a href="https://edu.chainguard.dev" class="link"><span class="logo">Chainguard Academy</span></a>
<a href="https://www.chainguard.dev/unchained" class="link"><span class="logo">Chainguard Blog</span></a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion pkg/auth/login/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions pkg/auth/token/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/validation/enforcer_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
2 changes: 1 addition & 1 deletion proto/capabilities/capabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"io"
"sort"
"strings"
sync "sync"
"sync"

"github.com/bits-and-blooms/bitset"
"go.uber.org/zap"
Expand Down
9 changes: 6 additions & 3 deletions proto/platform/tenant/v1/attestation.platform.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions proto/platform/tenant/v1/attestation.platform.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions proto/platform/tenant/v1/context.platform.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions proto/platform/tenant/v1/context.platform.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 {
Expand Down

0 comments on commit 2407796

Please sign in to comment.