From 1acaf477d07b6b221dd18430de680c54967be121 Mon Sep 17 00:00:00 2001 From: RTann Date: Thu, 24 Mar 2022 20:04:02 -0700 Subject: [PATCH 1/5] fix reg store --- sensor/common/registry/registry_store.go | 1 + sensor/common/registry/registry_store_test.go | 60 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 sensor/common/registry/registry_store_test.go diff --git a/sensor/common/registry/registry_store.go b/sensor/common/registry/registry_store.go index 6e7b6c6682c2e..28dff911256cf 100644 --- a/sensor/common/registry/registry_store.go +++ b/sensor/common/registry/registry_store.go @@ -77,6 +77,7 @@ func (rs *Store) UpsertRegistry(ctx context.Context, namespace, registry string, regs := rs.getRegistries(namespace) err = regs.UpdateImageIntegration(&storage.ImageIntegration{ + Id: registry, Name: registry, Type: "docker", Categories: []storage.ImageIntegrationCategory{storage.ImageIntegrationCategory_REGISTRY}, diff --git a/sensor/common/registry/registry_store_test.go b/sensor/common/registry/registry_store_test.go new file mode 100644 index 0000000000000..ac9709210ca17 --- /dev/null +++ b/sensor/common/registry/registry_store_test.go @@ -0,0 +1,60 @@ +package registry + +import ( + "context" + "testing" + + "github.com/stackrox/rox/generated/storage" + "github.com/stackrox/rox/pkg/docker/config" + "github.com/stretchr/testify/assert" +) + +// alwaysInsecureCheckTLS is an implementation of registry.CheckTLS +// which always says the given address is insecure. +func alwaysInsecureCheckTLS(_ context.Context, _ string) (bool, error) { + return false, nil +} + +func TestRegistryStore_same_namespace(t *testing.T) { + ctx := context.Background() + + regStore := NewRegistryStore(alwaysInsecureCheckTLS) + + dce := config.DockerConfigEntry{ + Username: "username", + Password: "password", + } + assert.NoError(t, regStore.UpsertRegistry(ctx, "qa", "image-registry.openshift-image-registry.svc:5000", dce)) + assert.NoError(t, regStore.UpsertRegistry(ctx, "qa", "image-registry.openshift-image-registry.svc.local:5000", dce)) + assert.NoError(t, regStore.UpsertRegistry(ctx, "qa", "172.99.12.11:5000", dce)) + + img := &storage.ImageName{ + Registry: "image-registry.openshift-image-registry.svc:5000", + Remote: "qa/nginx", + Tag: "nginx:1.18.0", + FullName: "image-registry.openshift-image-registry.svc:5000/qa/nginx:1.18.0", + } + reg, err := regStore.GetRegistryForImage(img) + assert.NoError(t, err) + assert.Equal(t, "image-registry.openshift-image-registry.svc:5000", reg.Name()) + + img = &storage.ImageName{ + Registry: "image-registry.openshift-image-registry.svc.local:5000", + Remote: "qa/nginx", + Tag: "nginx:1.18.0", + FullName: "image-registry.openshift-image-registry.svc.local:5000/qa/nginx:1.18.0", + } + reg, err = regStore.GetRegistryForImage(img) + assert.NoError(t, err) + assert.Equal(t, "image-registry.openshift-image-registry.svc.local:5000", reg.Name()) + + img = &storage.ImageName{ + Registry: "172.99.12.11:5000", + Remote: "qa/nginx", + Tag: "nginx:1.18.0", + FullName: "172.99.12.11:5000/qa/nginx:1.18.0", + } + reg, err = regStore.GetRegistryForImage(img) + assert.NoError(t, err) + assert.Equal(t, "172.99.12.11:5000", reg.Name()) +} From fd76adbcc9165297526f59cbbfa793969bd128de Mon Sep 17 00:00:00 2001 From: RTann Date: Thu, 24 Mar 2022 20:32:58 -0700 Subject: [PATCH 2/5] style --- sensor/common/registry/registry_store_test.go | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sensor/common/registry/registry_store_test.go b/sensor/common/registry/registry_store_test.go index ac9709210ca17..fef95ff2b418a 100644 --- a/sensor/common/registry/registry_store_test.go +++ b/sensor/common/registry/registry_store_test.go @@ -29,30 +29,30 @@ func TestRegistryStore_same_namespace(t *testing.T) { assert.NoError(t, regStore.UpsertRegistry(ctx, "qa", "172.99.12.11:5000", dce)) img := &storage.ImageName{ - Registry: "image-registry.openshift-image-registry.svc:5000", - Remote: "qa/nginx", - Tag: "nginx:1.18.0", - FullName: "image-registry.openshift-image-registry.svc:5000/qa/nginx:1.18.0", + Registry: "image-registry.openshift-image-registry.svc:5000", + Remote: "qa/nginx", + Tag: "nginx:1.18.0", + FullName: "image-registry.openshift-image-registry.svc:5000/qa/nginx:1.18.0", } reg, err := regStore.GetRegistryForImage(img) assert.NoError(t, err) assert.Equal(t, "image-registry.openshift-image-registry.svc:5000", reg.Name()) img = &storage.ImageName{ - Registry: "image-registry.openshift-image-registry.svc.local:5000", - Remote: "qa/nginx", - Tag: "nginx:1.18.0", - FullName: "image-registry.openshift-image-registry.svc.local:5000/qa/nginx:1.18.0", + Registry: "image-registry.openshift-image-registry.svc.local:5000", + Remote: "qa/nginx", + Tag: "nginx:1.18.0", + FullName: "image-registry.openshift-image-registry.svc.local:5000/qa/nginx:1.18.0", } reg, err = regStore.GetRegistryForImage(img) assert.NoError(t, err) assert.Equal(t, "image-registry.openshift-image-registry.svc.local:5000", reg.Name()) img = &storage.ImageName{ - Registry: "172.99.12.11:5000", - Remote: "qa/nginx", - Tag: "nginx:1.18.0", - FullName: "172.99.12.11:5000/qa/nginx:1.18.0", + Registry: "172.99.12.11:5000", + Remote: "qa/nginx", + Tag: "nginx:1.18.0", + FullName: "172.99.12.11:5000/qa/nginx:1.18.0", } reg, err = regStore.GetRegistryForImage(img) assert.NoError(t, err) From 492cfcae53d80fc0f5836af93c4e8a1920425d1e Mon Sep 17 00:00:00 2001 From: RTann Date: Thu, 24 Mar 2022 21:44:06 -0700 Subject: [PATCH 3/5] CI From adc13484ac1eae1e2a7f67c1669bb11c11e060a2 Mon Sep 17 00:00:00 2001 From: RTann Date: Fri, 25 Mar 2022 08:02:22 -0700 Subject: [PATCH 4/5] assert -> require --- sensor/common/registry/registry_store_test.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sensor/common/registry/registry_store_test.go b/sensor/common/registry/registry_store_test.go index fef95ff2b418a..85a0a944863c6 100644 --- a/sensor/common/registry/registry_store_test.go +++ b/sensor/common/registry/registry_store_test.go @@ -7,6 +7,7 @@ import ( "github.com/stackrox/rox/generated/storage" "github.com/stackrox/rox/pkg/docker/config" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) // alwaysInsecureCheckTLS is an implementation of registry.CheckTLS @@ -24,9 +25,9 @@ func TestRegistryStore_same_namespace(t *testing.T) { Username: "username", Password: "password", } - assert.NoError(t, regStore.UpsertRegistry(ctx, "qa", "image-registry.openshift-image-registry.svc:5000", dce)) - assert.NoError(t, regStore.UpsertRegistry(ctx, "qa", "image-registry.openshift-image-registry.svc.local:5000", dce)) - assert.NoError(t, regStore.UpsertRegistry(ctx, "qa", "172.99.12.11:5000", dce)) + require.NoError(t, regStore.UpsertRegistry(ctx, "qa", "image-registry.openshift-image-registry.svc:5000", dce)) + require.NoError(t, regStore.UpsertRegistry(ctx, "qa", "image-registry.openshift-image-registry.svc.local:5000", dce)) + require.NoError(t, regStore.UpsertRegistry(ctx, "qa", "172.99.12.11:5000", dce)) img := &storage.ImageName{ Registry: "image-registry.openshift-image-registry.svc:5000", @@ -35,7 +36,7 @@ func TestRegistryStore_same_namespace(t *testing.T) { FullName: "image-registry.openshift-image-registry.svc:5000/qa/nginx:1.18.0", } reg, err := regStore.GetRegistryForImage(img) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "image-registry.openshift-image-registry.svc:5000", reg.Name()) img = &storage.ImageName{ @@ -45,7 +46,7 @@ func TestRegistryStore_same_namespace(t *testing.T) { FullName: "image-registry.openshift-image-registry.svc.local:5000/qa/nginx:1.18.0", } reg, err = regStore.GetRegistryForImage(img) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "image-registry.openshift-image-registry.svc.local:5000", reg.Name()) img = &storage.ImageName{ @@ -55,6 +56,6 @@ func TestRegistryStore_same_namespace(t *testing.T) { FullName: "172.99.12.11:5000/qa/nginx:1.18.0", } reg, err = regStore.GetRegistryForImage(img) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "172.99.12.11:5000", reg.Name()) } From 8a7f46a6503afd9a20531f2f945891c251446537 Mon Sep 17 00:00:00 2001 From: RTann Date: Fri, 25 Mar 2022 08:39:24 -0700 Subject: [PATCH 5/5] CI