Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.18
0.12.19
9 changes: 8 additions & 1 deletion internal/cli/osprofile.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ var osProfileSchema = `
"existingCvesURL": { "type": ["string", "null"] },
"fixedCvesURL": { "type": ["string", "null"] },
"securityFeature": { "type": "string" },
"platformBundle": { "type": ["string", "null"] }
"platformBundle": { "type": ["string", "null"] },
"tlsCaCert": { "type": ["string", "null"] }
},
"required": [
"name", "type", "provider", "architecture", "profileName",
Expand All @@ -102,6 +103,7 @@ type OSProfileSpec struct {
PlatformBundle string `yaml:"platformBundle"`
OsExistingCvesURL string `yaml:"osExistingCvesURL"`
OsFixedCvesURL string `yaml:"osFixedCvesURL"`
TLSCaCert string `yaml:"tlsCaCert"`
}

type NestedSpec struct {
Expand Down Expand Up @@ -148,6 +150,10 @@ func printOSProfile(writer io.Writer, OSProfile *infra.OperatingSystemResource)
_, _ = fmt.Fprintf(writer, "Created: \t%v\n", OSProfile.Timestamps.CreatedAt)
_, _ = fmt.Fprintf(writer, "Updated: \t%v\n", OSProfile.Timestamps.UpdatedAt)

if OSProfile.TlsCaCert != nil {
_, _ = fmt.Fprintf(writer, "TLS CA Cert: \t%v\n", *OSProfile.TlsCaCert)
}

if OSProfile.ExistingCves != nil && OSProfile.FixedCves != nil {

if *OSProfile.ExistingCves != "" {
Expand Down Expand Up @@ -416,6 +422,7 @@ func runCreateOSProfileCommand(cmd *cobra.Command, args []string) error {
Sha256: spec.Spec.OsImageSha256,
FixedCvesUrl: &spec.Spec.OsFixedCvesURL,
ExistingCvesUrl: &spec.Spec.OsExistingCvesURL,
TlsCaCert: &spec.Spec.TLSCaCert,
}, auth.AddAuthHeader)
if err != nil {
return processError(err)
Expand Down
3 changes: 3 additions & 0 deletions pkg/rest/infra/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading