Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Replacing t.fatal with require Package #6680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 17, 2024
Merged

Replacing t.fatal with require Package #6680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9301576
Replace t.Fatal with require package
AshwinSriram11 Jun 14, 2024
0d82afc
Reviewed changes added
AshwinSriram11 Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 15 additions & 37 deletions pkg/admission/admission_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
jsonpatch "github.com/evanphx/json-patch/v5"
"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/stretchr/testify/require"
"gotest.tools/v3/golden"
v1 "k8s.io/api/admission/v1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
Expand Down Expand Up @@ -138,16 +139,12 @@ func TestMutateNonStringsToStrings(t *testing.T) {

// Apply patch to original request
patchObj, err := jsonpatch.DecodePatch(resp.Response.Patch)
if err != nil {
t.Fatal(err, "Expected a valid patch")
}
require.NoError(t, err)

rev := v1.AdmissionReview{}
deserializer.Decode(golden.Get(t, "nonStringsInLabelsAnnotations.golden"), nil, &rev)
rev.Request.Object.Raw, err = patchObj.Apply(rev.Request.Object.Raw)
if err != nil {
fmt.Println(string(resp.Response.Patch))
t.Fatal(err, "Expected to successfully apply patch")
}
require.NoErrorf(t, err, string(resp.Response.Patch))
request, _ = json.Marshal(rev)

// Sent patched request to validation endpoint
Expand Down Expand Up @@ -299,25 +296,18 @@ func TestAlertmanagerConfigConversion(t *testing.T) {
} {
t.Run(tc.name+","+tc.from+">"+tc.to, func(t *testing.T) {
resp := sendConversionReview(t, ts, buildConversionReviewFromAlertmanagerConfigSpec(t, tc.from, tc.to, string(golden.Get(t, tc.golden)[:])))
if resp.Response.Result.Status != "Success" {
t.Fatalf(
"Unexpected conversion result, wanted 'Success' but got %v - (result=%v)",
resp.Response.Result.Status,
resp.Response.Result)
}
require.Equal(t, "Success", resp.Response.Result.Status, "Unexpected conversion result, wanted 'Success' but got %v - (result=%v)",
resp.Response.Result.Status,
resp.Response.Result)

if len(resp.Response.ConvertedObjects) != 1 {
t.Fatalf("expected 1 converted object, got %d", len(resp.Response.ConvertedObjects))
}
require.Len(t, resp.Response.ConvertedObjects, 1, "expected 1 converted object, got %d", len(resp.Response.ConvertedObjects))

if tc.checkFn == nil {
return
}

err := tc.checkFn(resp.Response.ConvertedObjects[0].Raw)
if err != nil {
t.Fatalf("unexpected error while checking converted object: %v", err)
}
require.NoError(t, err)
})
}
}
Expand All @@ -334,39 +324,27 @@ func server(h http.HandlerFunc) *httptest.Server {

func sendAdmissionReview(t *testing.T, ts *httptest.Server, b []byte) *v1.AdmissionReview {
resp, err := http.Post(ts.URL, "application/json", bytes.NewReader(b))
if err != nil {
t.Fatalf("POST request returned an error: %s", err)
}
require.NoError(t, err)

body, err := io.ReadAll(resp.Body)
if err != nil {
t.Fatalf("io.ReadAll(resp.Body) returned an error: %s", err)
}
require.NoError(t, err)

rev := &v1.AdmissionReview{}
if err := json.Unmarshal(body, rev); err != nil {
t.Fatalf("unable to parse webhook response: %s", err)
}
require.NoError(t, json.Unmarshal(body, rev))

return rev
}

func sendConversionReview(t *testing.T, ts *httptest.Server, b []byte) *apiextensionsv1.ConversionReview {
t.Helper()
resp, err := http.Post(ts.URL, "application/json", bytes.NewReader(b))
if err != nil {
t.Fatalf("POST request returned an error: %s", err)
}
require.NoError(t, err)

body, err := io.ReadAll(resp.Body)
if err != nil {
t.Fatalf("io.ReadAll(resp.Body) returned an error: %s", err)
}
require.NoError(t, err)

rev := &apiextensionsv1.ConversionReview{}
if err := json.Unmarshal(body, rev); err != nil {
t.Fatalf("unable to parse webhook response: %s (%q)", err, string(body))
}
require.NoError(t, json.Unmarshal(body, rev))

return rev
}
Expand Down
90 changes: 22 additions & 68 deletions pkg/assets/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,13 @@ func TestGetSecretKey(t *testing.T) {
s, err := store.GetSecretKey(context.Background(), tc.ns, sel)

if tc.err {
if err == nil {
t.Fatal("expecting error, got no error")
}
require.Error(t, err)
return
}

if err != nil {
t.Fatalf("expecting no error, got %q", err)
}
require.NoError(t, err)

if s != tc.expected {
t.Fatalf("expecting %q, got %q", tc.expected, s)
}
require.Equal(t, tc.expected, s, "expecting %q, got %q", tc.expected, s)
})
}
}
Expand Down Expand Up @@ -254,33 +248,21 @@ func TestAddBasicAuth(t *testing.T) {
err := store.AddBasicAuth(context.Background(), tc.ns, basicAuth)

if tc.err {
if err == nil {
t.Fatal("expecting error, got no error")
}
require.Error(t, err)
return
}

if err != nil {
t.Fatalf("expecting no error, got %q", err)
}
require.NoError(t, err)

b, err := store.ForNamespace(tc.ns).GetSecretKey(basicAuth.Password)
if err != nil {
t.Fatalf("expecting no error, got %s", err)
}
require.NoError(t, err)

if string(b) != tc.expectedPassword {
t.Fatalf("expecting password value %q, got %q", tc.expectedPassword, string(b))
}
require.Equal(t, tc.expectedPassword, string(b), "expecting password value %q, got %q", tc.expectedPassword, string(b))

b, err = store.ForNamespace(tc.ns).GetSecretKey(basicAuth.Username)
if err != nil {
t.Fatalf("expecting no error, got %s", err)
}
require.NoError(t, err)

if string(b) != tc.expectedUser {
t.Fatalf("expecting username value %q, got %q", tc.expectedUser, string(b))
}
require.Equal(t, tc.expectedUser, string(b), "expecting username value %q, got %q", tc.expectedUser, string(b))
})
}
}
Expand Down Expand Up @@ -738,45 +720,29 @@ func TestAddTLSConfig(t *testing.T) {
err := store.AddSafeTLSConfig(context.Background(), tc.ns, &tc.tlsConfig.SafeTLSConfig)

if tc.err {
if err == nil {
t.Fatal("expecting error, got no error")
}
require.Error(t, err)
return
}

if err != nil {
t.Fatalf("expecting no error, got %q", err)
}
require.NoError(t, err)

key := TLSAssetKeyFromSelector(tc.ns, tc.tlsConfig.CA)

ca, found := store.TLSAssets[key]
if !found {
t.Fatalf("expecting to find key %q but got nothing", key)
}
if string(ca) != tc.expectedCA {
t.Fatalf("expecting CA %q, got %q", tc.expectedCA, ca)
}
require.True(t, found, "expecting to find key %q but got nothing", key)
require.Equal(t, tc.expectedCA, string(ca), "expecting CA %q, got %q", tc.expectedCA, ca)

key = TLSAssetKeyFromSelector(tc.ns, tc.tlsConfig.Cert)

cert, found := store.TLSAssets[key]
if !found {
t.Fatalf("expecting to find key %q but got nothing", key)
}
if string(cert) != tc.expectedCert {
t.Fatalf("expecting cert %q, got %q", tc.expectedCert, cert)
}
require.True(t, found, "expecting to find key %q but got nothing", key)
require.Equal(t, tc.expectedCert, string(cert), "expecting cert %q, got %q", tc.expectedCert, cert)

key = TLSAssetKeyFromSecretSelector(tc.ns, tc.tlsConfig.KeySecret)

k, found := store.TLSAssets[key]
if !found {
t.Fatalf("expecting to find key %q but got nothing", key)
}
if string(k) != tc.expectedKey {
t.Fatalf("expecting cert key %q, got %q", tc.expectedCert, k)
}
require.True(t, found, "expecting to find key %q but got nothing", key)
require.Equal(t, tc.expectedKey, string(k), "expecting cert key %q, got %q", tc.expectedCert, k)
})
}
}
Expand Down Expand Up @@ -853,30 +819,21 @@ func TestAddAuthorization(t *testing.T) {
err := store.AddAuthorizationCredentials(context.Background(), tc.ns, sel)

if tc.err {
if err == nil {
t.Fatal("expecting error, got no error")
}
require.Error(t, err)
return
}

if err != nil {
t.Fatalf("expecting no error, got %q", err)
}
require.NoError(t, err)

if sel.Credentials.Name == "" {
return
}

b, err := store.ForNamespace(tc.ns).GetSecretKey(*sel.Credentials)

if err != nil {
t.Fatalf("expecting to find secret key but got %s", err)
}
require.NoError(t, err)

s := string(b)
if s != tc.expected {
t.Fatalf("expecting %q, got %q", tc.expected, s)
}
require.Equal(t, tc.expected, s, "expecting %q, got %q", tc.expected, s)
})
}
}
Expand Down Expand Up @@ -905,10 +862,7 @@ func TestAddAuthorizationNoCredentials(t *testing.T) {
}

err := store.AddAuthorizationCredentials(context.Background(), "foo", sel)

if err != nil {
t.Fatalf("expecting no error, got %q", err)
}
require.NoError(t, err)
})
}

Expand Down
Loading