Switch to tag based

Signed-off-by: Hayden Blauzvern <hblauzvern@google.com>
sigstore · May 16, 2022 · 48d0de4 · 48d0de4
1 parent 42c59e7
commit 48d0de4
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 82 deletions.
diff --git a/pkg/config/config_network_test.go b/pkg/config/config_network_test.go
@@ -0,0 +1,92 @@
+// Copyright 2022 The Sigstore 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.
+//
+
+//go:build !hermetic
+
+package config
+
+import (
+	"context"
+	"io/ioutil"
+	"path/filepath"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+)
+
+func TestLoad(t *testing.T) {
+	td := t.TempDir()
+	cfgPath := filepath.Join(td, "config.json")
+	if err := ioutil.WriteFile(cfgPath, []byte(validCfg), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	cfg, _ := Load(cfgPath)
+	got, ok := cfg.GetIssuer("https://accounts.google.com")
+	if !ok {
+		t.Error("expected true, got false")
+	}
+	if got.ClientID != "foo" {
+		t.Errorf("expected foo, got %s", got.ClientID)
+	}
+	if got.IssuerURL != "https://accounts.google.com" {
+		t.Errorf("expected https://accounts.google.com, got %s", got.IssuerURL)
+	}
+	if got := len(cfg.OIDCIssuers); got != 1 {
+		t.Errorf("expected 1 issuer, got %d", got)
+	}
+
+	got, ok = cfg.GetIssuer("https://oidc.eks.fantasy-land.amazonaws.com/id/CLUSTERIDENTIFIER")
+	if !ok {
+		t.Error("expected true, got false")
+	}
+	if got.ClientID != "bar" {
+		t.Errorf("expected bar, got %s", got.ClientID)
+	}
+	if got.IssuerURL != "https://oidc.eks.fantasy-land.amazonaws.com/id/CLUSTERIDENTIFIER" {
+		t.Errorf("expected https://oidc.eks.fantasy-land.amazonaws.com/id/CLUSTERIDENTIFIER, got %s", got.IssuerURL)
+	}
+
+	if _, ok := cfg.GetIssuer("not_an_issuer"); ok {
+		t.Error("no error returned from an unconfigured issuer")
+	}
+}
+
+func TestLoadDefaults(t *testing.T) {
+	td := t.TempDir()
+
+	// Don't put anything here!
+	cfgPath := filepath.Join(td, "config.json")
+	cfg, err := Load(cfgPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if diff := cmp.Diff(DefaultConfig, cfg, cmpopts.IgnoreUnexported(FulcioConfig{})); diff != "" {
+		t.Errorf("DefaultConfig(): -want +got: %s", diff)
+	}
+
+	ctx := context.Background()
+
+	if got := FromContext(ctx); nil != got {
+		t.Errorf("FromContext(): %#v, wanted nil", got)
+	}
+
+	ctx = With(ctx, cfg)
+	if diff := cmp.Diff(cfg, FromContext(ctx), cmpopts.IgnoreUnexported(FulcioConfig{})); diff != "" {
+		t.Errorf("FromContext(): -want +got: %s", diff)
+	}
+}
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -16,14 +16,7 @@
 package config
 
 import (
-	"context"
-	"io/ioutil"
-	"os"
-	"path/filepath"
 	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 var validCfg = `
@@ -42,13 +35,6 @@ var validCfg = `
 }
 `
 
-// Skip test when HERMETIC=true is set, since config tests require network access
-func skipHermetic(t *testing.T) {
-	if os.Getenv("HERMETIC") != "" {
-		t.Skip("Skipping testing in hermetic test environment")
-	}
-}
-
 func TestMetaURLs(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -100,71 +86,3 @@ func TestMetaURLs(t *testing.T) {
 		})
 	}
 }
-
-func TestLoad(t *testing.T) {
-	skipHermetic(t)
-
-	td := t.TempDir()
-	cfgPath := filepath.Join(td, "config.json")
-	if err := ioutil.WriteFile(cfgPath, []byte(validCfg), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	cfg, _ := Load(cfgPath)
-	got, ok := cfg.GetIssuer("https://accounts.google.com")
-	if !ok {
-		t.Error("expected true, got false")
-	}
-	if got.ClientID != "foo" {
-		t.Errorf("expected foo, got %s", got.ClientID)
-	}
-	if got.IssuerURL != "https://accounts.google.com" {
-		t.Errorf("expected https://accounts.google.com, got %s", got.IssuerURL)
-	}
-	if got := len(cfg.OIDCIssuers); got != 1 {
-		t.Errorf("expected 1 issuer, got %d", got)
-	}
-
-	got, ok = cfg.GetIssuer("https://oidc.eks.fantasy-land.amazonaws.com/id/CLUSTERIDENTIFIER")
-	if !ok {
-		t.Error("expected true, got false")
-	}
-	if got.ClientID != "bar" {
-		t.Errorf("expected bar, got %s", got.ClientID)
-	}
-	if got.IssuerURL != "https://oidc.eks.fantasy-land.amazonaws.com/id/CLUSTERIDENTIFIER" {
-		t.Errorf("expected https://oidc.eks.fantasy-land.amazonaws.com/id/CLUSTERIDENTIFIER, got %s", got.IssuerURL)
-	}
-
-	if _, ok := cfg.GetIssuer("not_an_issuer"); ok {
-		t.Error("no error returned from an unconfigured issuer")
-	}
-}
-
-func TestLoadDefaults(t *testing.T) {
-	skipHermetic(t)
-
-	td := t.TempDir()
-
-	// Don't put anything here!
-	cfgPath := filepath.Join(td, "config.json")
-	cfg, err := Load(cfgPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if diff := cmp.Diff(DefaultConfig, cfg, cmpopts.IgnoreUnexported(FulcioConfig{})); diff != "" {
-		t.Errorf("DefaultConfig(): -want +got: %s", diff)
-	}
-
-	ctx := context.Background()
-
-	if got := FromContext(ctx); nil != got {
-		t.Errorf("FromContext(): %#v, wanted nil", got)
-	}
-
-	ctx = With(ctx, cfg)
-	if diff := cmp.Diff(cfg, FromContext(ctx), cmpopts.IgnoreUnexported(FulcioConfig{})); diff != "" {
-		t.Errorf("FromContext(): -want +got: %s", diff)
-	}
-}