v1: add test for cs repo prefix

osbuild · Feb 27, 2025 · f7c9184 · f7c9184
1 parent 946fd08
commit f7c9184
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/internal/v1/handler_post_compose_test.go b/internal/v1/handler_post_compose_test.go
@@ -791,7 +791,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 					ImageType:    composer.ImageTypesGuestImage,
 					Repositories: []composer.Repository{
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/baseos"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/baseos"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -801,7 +801,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 							PackageSets: nil,
 						},
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/appstream"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/appstream"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -840,7 +840,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 					ImageType:    composer.ImageTypesGuestImage,
 					Repositories: []composer.Repository{
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/baseos"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/baseos"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -850,7 +850,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 							PackageSets: nil,
 						},
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/appstream"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/appstream"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -913,7 +913,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 					ImageType:    composer.ImageTypesGuestImage,
 					Repositories: []composer.Repository{
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/baseos"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/baseos"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -923,7 +923,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 							PackageSets: nil,
 						},
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/appstream"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/appstream"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -940,7 +940,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 				Customizations: &composer.Customizations{
 					PayloadRepositories: &[]composer.Repository{
 						{
-							Baseurl:  common.ToPtr("https://content-sources.org/snappy/payload"),
+							Baseurl:  common.ToPtr("https://content-sources.org/api/neat/snappy/payload"),
 							CheckGpg: common.ToPtr(true),
 							Gpgkey:   common.ToPtr("some-gpg-key"),
 							Rhsm:     common.ToPtr(false),
@@ -1011,7 +1011,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 					ImageType:    composer.ImageTypesGuestImage,
 					Repositories: []composer.Repository{
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/baseos"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/baseos"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -1021,7 +1021,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 							PackageSets: nil,
 						},
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/appstream"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/appstream"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -1038,13 +1038,13 @@ func TestComposeWithSnapshots(t *testing.T) {
 				Customizations: &composer.Customizations{
 					PayloadRepositories: &[]composer.Repository{
 						{
-							Baseurl:  common.ToPtr("https://content-sources.org/snappy/payload"),
+							Baseurl:  common.ToPtr("https://content-sources.org/api/neat/snappy/payload"),
 							CheckGpg: common.ToPtr(true),
 							Gpgkey:   common.ToPtr("some-gpg-key"),
 							Rhsm:     common.ToPtr(false),
 						},
 						{
-							Baseurl: common.ToPtr("https://content-sources.org/snappy/payload2"),
+							Baseurl: common.ToPtr("https://content-sources.org/api/neat/snappy/payload2"),
 							Rhsm:    common.ToPtr(false),
 						},
 					},
@@ -1106,7 +1106,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 					ImageType:    composer.ImageTypesGuestImage,
 					Repositories: []composer.Repository{
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/baseos"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/baseos"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -1116,7 +1116,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 							PackageSets: nil,
 						},
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/appstream"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/appstream"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -1133,7 +1133,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 				Customizations: &composer.Customizations{
 					PayloadRepositories: &[]composer.Repository{
 						{
-							Baseurl:  common.ToPtr("https://content-sources.org/snappy/payload"),
+							Baseurl:  common.ToPtr("https://content-sources.org/api/neat/snappy/payload"),
 							CheckGpg: common.ToPtr(true),
 							Gpgkey:   common.ToPtr("some-gpg-key"),
 							Rhsm:     common.ToPtr(false),
@@ -1220,7 +1220,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 							Mirrorlist:  nil,
 							PackageSets: nil,
 						}, {
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/baseos"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/baseos"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -1230,7 +1230,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 							PackageSets: nil,
 						},
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/appstream"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/appstream"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -1249,7 +1249,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 				Customizations: &composer.Customizations{
 					PayloadRepositories: &[]composer.Repository{
 						{
-							Baseurl:  common.ToPtr("https://content-sources.org/snappy/payload"),
+							Baseurl:  common.ToPtr("https://content-sources.org/api/neat/snappy/payload"),
 							CheckGpg: common.ToPtr(true),
 							Gpgkey:   common.ToPtr("some-gpg-key"),
 							Rhsm:     common.ToPtr(false),
@@ -1303,7 +1303,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 					ImageType:    composer.ImageTypesGuestImage,
 					Repositories: []composer.Repository{
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/baseos"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/baseos"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -1313,7 +1313,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 							PackageSets: nil,
 						},
 						{
-							Baseurl:     common.ToPtr("https://content-sources.org/snappy/appstream"),
+							Baseurl:     common.ToPtr("https://content-sources.org/api/neat/snappy/appstream"),
 							Rhsm:        common.ToPtr(false),
 							Gpgkey:      common.ToPtr(mocks.RhelGPG),
 							CheckGpg:    common.ToPtr(true),
@@ -1330,7 +1330,7 @@ func TestComposeWithSnapshots(t *testing.T) {
 				Customizations: &composer.Customizations{
 					PayloadRepositories: &[]composer.Repository{
 						{
-							Baseurl: common.ToPtr("https://content-sources.org/snappy/payload3"),
+							Baseurl: common.ToPtr("https://content-sources.org/api/neat/snappy/payload3"),
 							Rhsm:    common.ToPtr(false),
 						},
 					},

diff --git a/internal/v1/server_test.go b/internal/v1/server_test.go
@@ -197,6 +197,7 @@ func startServer(t *testing.T, tscc *testServerClientsConf, conf *v1.ServerConfi
 	serverConfig.ProvClient = provClient
 	serverConfig.CSClient = csClient
 	serverConfig.CSReposURL = "https://content-sources.org"
+	serverConfig.CSReposPrefix = "/api/neat"
 	serverConfig.RecommendClient = recommendClient
 	serverConfig.ComplianceClient = complianceClient
 	if serverConfig.QuotaFile == "" {