Skip to content
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

ROX-20150: Remove resource config from service template #1439

Merged
merged 1 commit into from
Nov 6, 2023
Merged

ROX-20150: Remove resource config from service template #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,78 +462,78 @@
"filename": "templates/service-template.yml",
"hashed_secret": "13032f402fed753c2248419ea4f69f99931f6dbc",
"is_verified": false,
"line_number": 574
"line_number": 514
},
{
"type": "Base64 High Entropy String",
"filename": "templates/service-template.yml",
"hashed_secret": "30025f80f6e22cdafb85db387d50f90ea884576a",
"is_verified": false,
"line_number": 574
"line_number": 514
},
{
"type": "Base64 High Entropy String",
"filename": "templates/service-template.yml",
"hashed_secret": "355f24fd038bcaf85617abdcaa64af51ed19bbcf",
"is_verified": false,
"line_number": 574
"line_number": 514
},
{
"type": "Base64 High Entropy String",
"filename": "templates/service-template.yml",
"hashed_secret": "3d8a1dcd2c3c765ce35c9a9552d23273cc4ddace",
"is_verified": false,
"line_number": 574
"line_number": 514
},
{
"type": "Base64 High Entropy String",
"filename": "templates/service-template.yml",
"hashed_secret": "4ac7b0522761eba972467942cd5cd7499dd2c361",
"is_verified": false,
"line_number": 574
"line_number": 514
},
{
"type": "Base64 High Entropy String",
"filename": "templates/service-template.yml",
"hashed_secret": "7639ab2a6bcf2ea30a055a99468c9cd844d4c22a",
"is_verified": false,
"line_number": 574
"line_number": 514
},
{
"type": "Base64 High Entropy String",
"filename": "templates/service-template.yml",
"hashed_secret": "b56360daf4793d2a74991a972b34d95bc00fb2da",
"is_verified": false,
"line_number": 574
"line_number": 514
},
{
"type": "Base64 High Entropy String",
"filename": "templates/service-template.yml",
"hashed_secret": "c9a73ef9ee8ce9f38437227801c70bcc6740d1a1",
"is_verified": false,
"line_number": 574
"line_number": 514
},
{
"type": "Base64 High Entropy String",
"filename": "templates/service-template.yml",
"hashed_secret": "14736999d9940728c5294277831a702f7882dece",
"is_verified": false,
"line_number": 611
"line_number": 551
},
{
"type": "Secret Keyword",
"filename": "templates/service-template.yml",
"hashed_secret": "4e199b4a1c40b497a95fcd1cd896351733849949",
"is_verified": false,
"line_number": 698,
"line_number": 638,
"is_secret": false
},
{
"type": "Secret Keyword",
"filename": "templates/service-template.yml",
"hashed_secret": "9d51dabe59aa776bef2909d3689374ebb93ab2be",
"is_verified": false,
"line_number": 741
"line_number": 681
}
],
"test/support/certs.json": [
Expand Down Expand Up @@ -564,5 +564,5 @@
}
]
},
"generated_at": "2023-11-01T12:16:42Z"
"generated_at": "2023-11-06T14:09:00Z"
}
12 changes: 0 additions & 12 deletions internal/dinosaur/pkg/api/dbapi/central_request_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ type CentralRequest struct {
// CentralList ...
type CentralList []*CentralRequest

// CentralIndex ...
type CentralIndex map[string]*CentralRequest

// AuthConfig keeps all we need to set up IdP for a Central instance.
type AuthConfig struct {
// OIDC client ID. It is used for authenticating users in Central via connected IdP.
Expand All @@ -106,15 +103,6 @@ type AuthConfig struct {
ClientOrigin string `json:"client_origin"`
}

// Index ...
func (l CentralList) Index() CentralIndex {
index := CentralIndex{}
for _, o := range l {
index[o.ID] = o
}
return index
}

// BeforeCreate ...
func (k *CentralRequest) BeforeCreate(scope *gorm.DB) error {
// To allow the id set on the CentralRequest object to be used. This is useful for testing purposes.
Expand Down
61 changes: 0 additions & 61 deletions internal/dinosaur/pkg/api/dbapi/central_spec.go
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions internal/dinosaur/pkg/defaults/default_central_spec.go
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions internal/dinosaur/pkg/defaults/default_scanner_spec.go
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions internal/dinosaur/pkg/defaults/parsers.go
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions internal/dinosaur/pkg/defaults/pretty_printer.go
View file
Open in desktop

This file was deleted.

Loading
Loading