Update osbuild/images v0.63.0

Pulling in (among others): - osbuild/images#700 - Blueprint User customization change required. - osbuild/images#705
osbuild · May 28, 2024 · a3a539a · a3a539a
1 parent c1d56a5
commit a3a539a
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 56 deletions.
diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/labstack/gommon v0.4.2
 	github.com/openshift-online/ocm-sdk-go v0.1.420
 	github.com/oracle/oci-go-sdk/v54 v54.0.0
-	github.com/osbuild/images v0.62.0
+	github.com/osbuild/images v0.63.0
 	github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1
 	github.com/osbuild/pulp-client v0.1.0
 	github.com/prometheus/client_golang v1.19.1

diff --git a/go.sum b/go.sum
@@ -500,8 +500,8 @@ github.com/openshift-online/ocm-sdk-go v0.1.420 h1:zC/TboLemC09T5qxSdF5IZR20wnn4
 github.com/openshift-online/ocm-sdk-go v0.1.420/go.mod h1:CiAu2jwl3ITKOxkeV0Qnhzv4gs35AmpIzVABQLtcI2Y=
 github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXchUUZ+LS4=
 github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
-github.com/osbuild/images v0.62.0 h1:SFISmpEDjvhV9GEsRkRdw7WwTHJWvSoB7zwqxqdM7Dw=
-github.com/osbuild/images v0.62.0/go.mod h1:kkiJNrd0XkVfwBxrJ8wWt6/d0+Eb+tG+zZVnw/xXE/8=
+github.com/osbuild/images v0.63.0 h1:tk75nDV78Pbi+RBXCclHYQbzzJeqJDsCMVmDCWRhLcM=
+github.com/osbuild/images v0.63.0/go.mod h1:kkiJNrd0XkVfwBxrJ8wWt6/d0+Eb+tG+zZVnw/xXE/8=
 github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1 h1:UFEJIcPa46W8gtWgOYzriRKYyy1t6SWL0BI7fPTuVvc=
 github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1/go.mod h1:z+WA+dX6qMwc7fqY5jCzESDIlg4WR2sBQezxsoXv9Ik=
 github.com/osbuild/pulp-client v0.1.0 h1:L0C4ezBJGTamN3BKdv+rKLuq/WxXJbsFwz/Hj7aEmJ8=

diff --git a/internal/blueprint/customizations.go b/internal/blueprint/customizations.go
@@ -65,16 +65,17 @@ type SSHKeyCustomization struct {
 }
 
 type UserCustomization struct {
-	Name        string   `json:"name" toml:"name"`
-	Description *string  `json:"description,omitempty" toml:"description,omitempty"`
-	Password    *string  `json:"password,omitempty" toml:"password,omitempty"`
-	Key         *string  `json:"key,omitempty" toml:"key,omitempty"`
-	Home        *string  `json:"home,omitempty" toml:"home,omitempty"`
-	Shell       *string  `json:"shell,omitempty" toml:"shell,omitempty"`
-	Groups      []string `json:"groups,omitempty" toml:"groups,omitempty"`
-	UID         *int     `json:"uid,omitempty" toml:"uid,omitempty"`
-	GID         *int     `json:"gid,omitempty" toml:"gid,omitempty"`
-	ExpireDate  *int     `json:"expiredate,omitempty" toml:"expiredate,omitempty"`
+	Name               string   `json:"name" toml:"name"`
+	Description        *string  `json:"description,omitempty" toml:"description,omitempty"`
+	Password           *string  `json:"password,omitempty" toml:"password,omitempty"`
+	Key                *string  `json:"key,omitempty" toml:"key,omitempty"`
+	Home               *string  `json:"home,omitempty" toml:"home,omitempty"`
+	Shell              *string  `json:"shell,omitempty" toml:"shell,omitempty"`
+	Groups             []string `json:"groups,omitempty" toml:"groups,omitempty"`
+	UID                *int     `json:"uid,omitempty" toml:"uid,omitempty"`
+	GID                *int     `json:"gid,omitempty" toml:"gid,omitempty"`
+	ExpireDate         *int     `json:"expiredate,omitempty" toml:"expiredate,omitempty"`
+	ForcePasswordReset *bool    `json:"force_password_reset,omitempty" toml:"force_password_reset,omitempty"`
 }
 
 type GroupCustomization struct {

diff --git a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go
diff --git a/vendor/github.com/osbuild/images/pkg/customizations/users/users.go b/vendor/github.com/osbuild/images/pkg/customizations/users/users.go
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/ami.go
diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/sap.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/sap.go
diff --git a/vendor/github.com/osbuild/images/pkg/osbuild/users_stage.go b/vendor/github.com/osbuild/images/pkg/osbuild/users_stage.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -865,7 +865,7 @@ github.com/oracle/oci-go-sdk/v54/identity
 github.com/oracle/oci-go-sdk/v54/objectstorage
 github.com/oracle/oci-go-sdk/v54/objectstorage/transfer
 github.com/oracle/oci-go-sdk/v54/workrequests
-# github.com/osbuild/images v0.62.0
+# github.com/osbuild/images v0.63.0
 ## explicit; go 1.20
 github.com/osbuild/images/internal/common
 github.com/osbuild/images/internal/environment