Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package google-osconfig-agent for
openSUSE:Factory checked in at 2025-08-12 17:04:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-osconfig-agent (Old)
and /work/SRC/openSUSE:Factory/.google-osconfig-agent.new.1085 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-osconfig-agent"
Tue Aug 12 17:04:27 2025 rev:41 rq:1298882 version:20250729.00
Changes:
--------
---
/work/SRC/openSUSE:Factory/google-osconfig-agent/google-osconfig-agent.changes
2025-07-14 10:58:37.765861500 +0200
+++
/work/SRC/openSUSE:Factory/.google-osconfig-agent.new.1085/google-osconfig-agent.changes
2025-08-12 17:06:01.166881954 +0200
@@ -1,0 +2,25 @@
+Mon Aug 11 13:30:16 UTC 2025 - John Paul Adrian Glaubitz
<adrian.glaub...@suse.com>
+
+- Update to version 20250806.00
+ * Fixed JSON identifier for the universe domain (#855)
+- from version 20250729.00
+ * Bump github.com/google/s2a-go from 0.1.8 to 0.1.9 (#828)
+- from version 20250725.02
+ * Update utils.go (#854)
+ * Upgrade golang.org/x/oauth2 package to the latest. (#853)
+ * Bump golang.org/x/time from 0.9.0 to 0.12.0 (#839)
+- from version 20250725.01
+ * Bump golang.org/x/oauth2 (#848)
+ * Port fix for debian 11 to goo package manager. (#852)
+- from version 20250725.00
+ * Update Golang version in common.sh and skip backports
+ repo for debian 11 (#850)
+- from version 20250723.01
+ * Add workflows to build package for el10 (#849)
+- from version 20250721.00
+ * Make OS Config agent TPC aware (#846)
+- from version 20250718.00
+ * Create workflows for new Debian 13. (#847)
+- Drop CVE-2025-22868.patch, merged upstream
+
+-------------------------------------------------------------------
Old:
----
CVE-2025-22868.patch
osconfig-20250703.00.tar.gz
New:
----
osconfig-20250729.00.tar.gz
----------(Old B)----------
Old: * Create workflows for new Debian 13. (#847)
- Drop CVE-2025-22868.patch, merged upstream
----------(Old E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-osconfig-agent.spec ++++++
--- /var/tmp/diff_new_pack.lVKv2G/_old 2025-08-12 17:06:02.758948530 +0200
+++ /var/tmp/diff_new_pack.lVKv2G/_new 2025-08-12 17:06:02.762948697 +0200
@@ -24,7 +24,7 @@
%global import_path %{provider_prefix}
Name: google-osconfig-agent
-Version: 20250703.00
+Version: 20250729.00
Release: 0
Summary: Google Cloud Guest Agent
License: Apache-2.0
@@ -33,8 +33,6 @@
Source0: %{repo}-%{version}.tar.gz
Source1: vendor.tar.gz
Source2: rpmlintrc
-# PATCH-FIX-UPSTREAM - Fix unexpected memory consumption during token parsing
in golang.org/x/oauth2
-Patch0: CVE-2025-22868.patch
BuildRequires: golang(API) >= 1.22.4
BuildRequires: golang-packaging
Requires: google-guest-configs
@@ -51,9 +49,6 @@
%prep
%setup -q -n %{repo}-%{version}
%setup -q -D -T -a 1 -n %{repo}-%{version}
-pushd vendor/golang.org/x/oauth2
-%patch -P0 -p1
-popd
%build
%goprep %{import_path}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.lVKv2G/_old 2025-08-12 17:06:02.934955890 +0200
+++ /var/tmp/diff_new_pack.lVKv2G/_new 2025-08-12 17:06:02.942956224 +0200
@@ -3,8 +3,8 @@
<param name="url">https://github.com/GoogleCloudPlatform/osconfig</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="versionformat">20250703.00</param>
- <param name="revision">20250703.00</param>
+ <param name="versionformat">20250729.00</param>
+ <param name="revision">20250729.00</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
@@ -15,7 +15,7 @@
<param name="basename">osconfig</param>
</service>
<service name="go_modules" mode="disabled">
- <param name="archive">osconfig-20250703.00.tar.gz</param>
+ <param name="archive">osconfig-20250729.00.tar.gz</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.lVKv2G/_old 2025-08-12 17:06:03.070961577 +0200
+++ /var/tmp/diff_new_pack.lVKv2G/_new 2025-08-12 17:06:03.102962915 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/GoogleCloudPlatform/osconfig</param>
- <param
name="changesrevision">4243d93d1aaf4ac2ab7887155d84655cec2d067f</param></service></servicedata>
+ <param
name="changesrevision">6d3741d26882e1585233a875d67f466904b2ba0c</param></service></servicedata>
(No newline at EOF)
++++++ osconfig-20250703.00.tar.gz -> osconfig-20250729.00.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/agentconfig/agentconfig.go
new/osconfig-20250729.00/agentconfig/agentconfig.go
--- old/osconfig-20250703.00/agentconfig/agentconfig.go 2025-07-03
15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/agentconfig/agentconfig.go 2025-07-29
12:04:47.000000000 +0200
@@ -82,6 +82,9 @@
osConfigPollIntervalDefault = 10
osConfigMetadataPollTimeout = 60
+
+ // Default Google API domain
+ universeDomainDefault = "googleapis.com"
)
var (
@@ -125,6 +128,7 @@
zypperRepoFilePath string
yumRepoFilePath string
instanceID string
+ universeDomain string
numericProjectID int64
osConfigPollInterval int
debugEnabled bool
@@ -192,6 +196,7 @@
type metadataJSON struct {
Instance instanceJSON
Project projectJSON
+ Universe universeJSON
}
type instanceJSON struct {
@@ -207,6 +212,10 @@
NumericProjectID int64
}
+type universeJSON struct {
+ UniverseDomain string `json:"universe-domain"`
+}
+
type attributesJSON struct {
PollIntervalOld *json.Number `json:"os-config-poll-interval"`
PollInterval *json.Number `json:"osconfig-poll-interval"`
@@ -245,6 +254,8 @@
instanceZone: old.instanceZone,
instanceName: old.instanceName,
instanceID: old.instanceID,
+
+ universeDomain: universeDomainDefault,
}
if md.Project.ProjectID != "" {
@@ -263,6 +274,10 @@
c.instanceID = md.Instance.ID.String()
}
+ if md.Universe.UniverseDomain != "" {
+ c.universeDomain = md.Universe.UniverseDomain
+ }
+
// Check project first then instance as instance metadata overrides
project.
switch {
case md.Project.Attributes.InventoryEnabled != "":
@@ -389,6 +404,11 @@
parts := strings.Split(c.instanceZone, "/")
zone := parts[len(parts)-1]
c.svcEndpoint = strings.ReplaceAll(c.svcEndpoint, "{zone}", zone)
+
+ // Change hostname according to the universe domain
+ if c.universeDomain != universeDomainDefault {
+ c.svcEndpoint = strings.ReplaceAll(c.svcEndpoint,
universeDomainDefault, c.universeDomain)
+ }
}
func setTraceGetInventory(md metadataJSON, c *config) {
@@ -800,3 +820,13 @@
func FreeOSMemory() bool {
return strings.EqualFold(freeOSMemory, "true") || freeOSMemory == "1"
}
+
+// DisableCloudLogging returns true if universe domain is not equal to GDU
domain.
+func DisableCloudLogging() bool {
+ return !strings.EqualFold(getAgentConfig().universeDomain,
universeDomainDefault)
+}
+
+// UniverseDomain is the cloud universe domain
+func UniverseDomain() string {
+ return getAgentConfig().universeDomain
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/agentconfig/agentconfig_test.go
new/osconfig-20250729.00/agentconfig/agentconfig_test.go
--- old/osconfig-20250703.00/agentconfig/agentconfig_test.go 2025-07-03
15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/agentconfig/agentconfig_test.go 2025-07-29
12:04:47.000000000 +0200
@@ -224,10 +224,17 @@
}
func TestSvcEndpoint(t *testing.T) {
+ var request int
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r
*http.Request) {
- w.Header().Set("Etag", "sametag")
- // we always get zone value in instance metadata.
- fmt.Fprintln(w, `{"instance": {"id": 12345,"name":
"name","zone": "fakezone","attributes": {"osconfig-endpoint":
"{zone}-dev.osconfig.googleapis.com"}}}`)
+ switch request {
+ case 0:
+ w.Header().Set("Etag", "etag-0")
+ // we always get zone value in instance metadata.
+ fmt.Fprintln(w, `{"instance": {"id": 12345,"name":
"name","zone": "fakezone","attributes": {"osconfig-endpoint":
"{zone}-dev.osconfig.googleapis.com"}}}`)
+ case 1:
+ w.Header().Set("Etag", "etag-1")
+ fmt.Fprintln(w, `{"universe": {"universe-domain":
"domain.com"}, "instance": {"id": 12345,"name": "name","zone":
"fakezone","attributes": {"osconfig-endpoint":
"{zone}-dev.osconfig.googleapis.com"}}}`)
+ }
}))
defer ts.Close()
@@ -235,13 +242,15 @@
t.Fatalf("Error running os.Setenv: %v", err)
}
- if err := WatchConfig(context.Background()); err != nil {
- t.Fatalf("Error running SetConfig: %v", err)
- }
-
- expectedSvcEndpoint := "fakezone-dev.osconfig.googleapis.com"
- if SvcEndpoint() != expectedSvcEndpoint {
- t.Errorf("Default endpoint: got(%s) != want(%s)",
SvcEndpoint(), expectedSvcEndpoint)
+ for i, expectedSvcEndpoint := range
[]string{"fakezone-dev.osconfig.googleapis.com",
"fakezone-dev.osconfig.domain.com"} {
+ request = i
+ if err := WatchConfig(context.Background()); err != nil {
+ t.Fatalf("Error running SetConfig: %v", err)
+ }
+
+ if SvcEndpoint() != expectedSvcEndpoint {
+ t.Errorf("Default endpoint: got(%s) != want(%s)",
SvcEndpoint(), expectedSvcEndpoint)
+ }
}
}
@@ -261,3 +270,34 @@
t.Errorf("Unexpected output %+v", err)
}
}
+
+func TestDisableCloudLogging(t *testing.T) {
+ var request int
+ ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r
*http.Request) {
+ switch request {
+ case 0:
+ w.Header().Set("Etag", "etag-0")
+ fmt.Fprintln(w, `{"universe":{"universe-domain":
"domain.com"}}`)
+ case 1:
+ w.Header().Set("Etag", "etag-1")
+ fmt.Fprintln(w, `{"instance": {"zone": "fake-zone"}}`)
+ }
+ }))
+ defer ts.Close()
+
+ if err := os.Setenv("GCE_METADATA_HOST", strings.Trim(ts.URL,
"http://";)); err != nil {
+ t.Fatalf("Error running os.Setenv: %v", err)
+ }
+
+ for i, expectedDisableCloudLoggingValue := range []bool{true, false} {
+ request = i
+ if err := WatchConfig(context.Background()); err != nil {
+ t.Fatalf("Error running SetConfig: %v", err)
+ }
+
+ if DisableCloudLogging() != expectedDisableCloudLoggingValue {
+ t.Errorf("DisableCloudLogging: got(%t) != want(%t)",
DisableCloudLogging(), expectedDisableCloudLoggingValue)
+ }
+ }
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/agentendpoint/exec_task.go
new/osconfig-20250729.00/agentendpoint/exec_task.go
--- old/osconfig-20250703.00/agentendpoint/exec_task.go 2025-07-03
15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/agentendpoint/exec_task.go 2025-07-29
12:04:47.000000000 +0200
@@ -26,10 +26,13 @@
"time"
"cloud.google.com/go/storage"
+ "github.com/GoogleCloudPlatform/osconfig/agentconfig"
"github.com/GoogleCloudPlatform/osconfig/clog"
"github.com/GoogleCloudPlatform/osconfig/external"
"github.com/GoogleCloudPlatform/osconfig/util"
+ "google.golang.org/api/option"
+
"cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb"
)
@@ -61,7 +64,8 @@
}
func getGCSObject(ctx context.Context, bkt, obj string, gen int64) (string,
error) {
- cl, err := storage.NewClient(ctx)
+ cl, err := storage.NewClient(ctx,
option.WithUniverseDomain(agentconfig.UniverseDomain()))
+
if err != nil {
return "", fmt.Errorf("error creating gcs client: %v", err)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/config/file.go
new/osconfig-20250729.00/config/file.go
--- old/osconfig-20250703.00/config/file.go 2025-07-03 15:05:19.000000000
+0200
+++ new/osconfig-20250729.00/config/file.go 2025-07-29 12:04:47.000000000
+0200
@@ -24,9 +24,12 @@
"os"
"cloud.google.com/go/storage"
+ "github.com/GoogleCloudPlatform/osconfig/agentconfig"
"github.com/GoogleCloudPlatform/osconfig/external"
"github.com/GoogleCloudPlatform/osconfig/util"
+ "google.golang.org/api/option"
+
"cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb"
)
@@ -43,7 +46,7 @@
switch file.GetType().(type) {
case *agentendpointpb.OSPolicy_Resource_File_Gcs_:
- client, err := storage.NewClient(ctx)
+ client, err := storage.NewClient(ctx,
option.WithUniverseDomain(agentconfig.UniverseDomain()))
if err != nil {
return "", fmt.Errorf("error creating gcs client: %v",
err)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/e2e_tests/go.mod
new/osconfig-20250729.00/e2e_tests/go.mod
--- old/osconfig-20250703.00/e2e_tests/go.mod 2025-07-03 15:05:19.000000000
+0200
+++ new/osconfig-20250729.00/e2e_tests/go.mod 2025-07-29 12:04:47.000000000
+0200
@@ -21,8 +21,7 @@
require (
cloud.google.com/go v0.110.0 // indirect
- cloud.google.com/go/compute v1.19.1 // indirect
- cloud.google.com/go/compute/metadata v0.2.3 // indirect
+ cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/logging v1.7.0 // indirect
cos.googlesource.com/cos/tools.git v0.0.0-20210329212435-a349a79f950d
// indirect
github.com/StackExchange/wmi v1.2.1 // indirect
@@ -39,7 +38,7 @@
go.chromium.org/luci v0.0.0-20210524194916-901fa619ed56 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/net v0.38.0 // indirect
- golang.org/x/oauth2 v0.7.0 // indirect
+ golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/text v0.23.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/e2e_tests/go.sum
new/osconfig-20250729.00/e2e_tests/go.sum
--- old/osconfig-20250703.00/e2e_tests/go.sum 2025-07-03 15:05:19.000000000
+0200
+++ new/osconfig-20250729.00/e2e_tests/go.sum 2025-07-29 12:04:47.000000000
+0200
@@ -41,10 +41,8 @@
cloud.google.com/go/bigquery v1.5.0/go.mod
h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
cloud.google.com/go/bigquery v1.7.0/go.mod
h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
cloud.google.com/go/bigquery v1.8.0/go.mod
h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.19.1
h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY=
-cloud.google.com/go/compute v1.19.1/go.mod
h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE=
-cloud.google.com/go/compute/metadata v0.2.3
h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
-cloud.google.com/go/compute/metadata v0.2.3/go.mod
h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
+cloud.google.com/go/compute/metadata v0.3.0
h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
+cloud.google.com/go/compute/metadata v0.3.0/go.mod
h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
cloud.google.com/go/datastore v1.0.0/go.mod
h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0/go.mod
h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
@@ -438,8 +436,8 @@
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod
h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod
h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod
h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
-golang.org/x/oauth2 v0.7.0/go.mod
h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
+golang.org/x/oauth2 v0.27.0/go.mod
h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/e2e_tests/utils/utils.go
new/osconfig-20250729.00/e2e_tests/utils/utils.go
--- old/osconfig-20250703.00/e2e_tests/utils/utils.go 2025-07-03
15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/e2e_tests/utils/utils.go 2025-07-29
12:04:47.000000000 +0200
@@ -134,6 +134,9 @@
sleep 10
systemctl stop google-osconfig-agent
+# disable the backports repo for debian-11
+sed -i 's/^.*debian bullseye-backports main.*$//g' /etc/apt/sources.list
+
# install gnupg2 if not exist
apt-get update
apt-get install -y gnupg2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/go.mod
new/osconfig-20250729.00/go.mod
--- old/osconfig-20250703.00/go.mod 2025-07-03 15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/go.mod 2025-07-29 12:04:47.000000000 +0200
@@ -19,7 +19,7 @@
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
github.com/ulikunitz/xz v0.5.12
golang.org/x/crypto v0.38.0
- golang.org/x/oauth2 v0.24.0
+ golang.org/x/oauth2 v0.27.0
golang.org/x/sys v0.33.0
google.golang.org/api v0.214.0
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697
@@ -90,7 +90,7 @@
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 //
indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-containerregistry v0.19.1 // indirect
- github.com/google/s2a-go v0.1.8 // indirect
+ github.com/google/s2a-go v0.1.9 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
@@ -144,7 +144,7 @@
golang.org/x/net v0.40.0 // indirect
golang.org/x/sync v0.14.0 // indirect
golang.org/x/text v0.25.0 // indirect
- golang.org/x/time v0.9.0 // indirect
+ golang.org/x/time v0.12.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/genproto/googleapis/api
v0.0.0-20241202173237-19429a94021a // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/go.sum
new/osconfig-20250729.00/go.sum
--- old/osconfig-20250703.00/go.sum 2025-07-03 15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/go.sum 2025-07-29 12:04:47.000000000 +0200
@@ -262,8 +262,8 @@
github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod
h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod
h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/renameio v0.1.0/go.mod
h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
-github.com/google/s2a-go v0.1.8/go.mod
h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod
h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
github.com/google/subcommands v1.2.0/go.mod
h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
github.com/google/uuid v1.1.2/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -525,8 +525,8 @@
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
-golang.org/x/oauth2 v0.24.0/go.mod
h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
+golang.org/x/oauth2 v0.27.0/go.mod
h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -593,8 +593,8 @@
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
-golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod
h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod
h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod
h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod
h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/main.go
new/osconfig-20250729.00/main.go
--- old/osconfig-20250703.00/main.go 2025-07-03 15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/main.go 2025-07-29 12:04:47.000000000 +0200
@@ -98,7 +98,7 @@
func run(ctx context.Context) {
// Setup logging.
- opts := logger.LogOpts{LoggerName: "OSConfigAgent", UserAgent:
agentconfig.UserAgent(), DisableLocalLogging: agentconfig.DisableLocalLogging()}
+ opts := logger.LogOpts{LoggerName: "OSConfigAgent", UserAgent:
agentconfig.UserAgent(), DisableLocalLogging:
agentconfig.DisableLocalLogging(), DisableCloudLogging:
agentconfig.DisableCloudLogging()}
if agentconfig.Stdout() {
opts.Writers = []io.Writer{os.Stdout}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/packagebuild/common.sh
new/osconfig-20250729.00/packagebuild/common.sh
--- old/osconfig-20250703.00/packagebuild/common.sh 2025-07-03
15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/packagebuild/common.sh 2025-07-29
12:04:47.000000000 +0200
@@ -37,7 +37,7 @@
arch="arm64"
fi
- local GOLANG="go1.22.2.linux-${arch}.tar.gz"
+ local GOLANG="go1.24.2.linux-${arch}.tar.gz"
export GOPATH=/usr/share/gocode
export GOCACHE=/tmp/.cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osconfig-20250703.00/packagebuild/daisy_startupscript_deb.sh
new/osconfig-20250729.00/packagebuild/daisy_startupscript_deb.sh
--- old/osconfig-20250703.00/packagebuild/daisy_startupscript_deb.sh
2025-07-03 15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/packagebuild/daisy_startupscript_deb.sh
2025-07-29 12:04:47.000000000 +0200
@@ -32,6 +32,8 @@
# disable the backports repo for debian-10
sed -i 's/^.*debian buster-backports main.*$//g' /etc/apt/sources.list
+# disable the backports repo for debian-11
+sed -i 's/^.*debian bullseye-backports main.*$//g' /etc/apt/sources.list
try_command apt-get -y update
try_command apt-get install -y --no-install-{suggests,recommends} git-core \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osconfig-20250703.00/packagebuild/daisy_startupscript_goo.sh
new/osconfig-20250729.00/packagebuild/daisy_startupscript_goo.sh
--- old/osconfig-20250703.00/packagebuild/daisy_startupscript_goo.sh
2025-07-03 15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/packagebuild/daisy_startupscript_goo.sh
2025-07-29 12:04:47.000000000 +0200
@@ -29,6 +29,8 @@
# disable the backports repo for debian-10
sed -i 's/^.*debian buster-backports main.*$//g' /etc/apt/sources.list
+# disable the backports repo for debian-11
+sed -i 's/^.*debian bullseye-backports main.*$//g' /etc/apt/sources.list
try_command apt-get -y update
try_command apt-get install -y --no-install-{suggests,recommends} git-core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osconfig-20250703.00/packagebuild/workflows/build_deb13.wf.json
new/osconfig-20250729.00/packagebuild/workflows/build_deb13.wf.json
--- old/osconfig-20250703.00/packagebuild/workflows/build_deb13.wf.json
1970-01-01 01:00:00.000000000 +0100
+++ new/osconfig-20250729.00/packagebuild/workflows/build_deb13.wf.json
2025-07-29 12:04:47.000000000 +0200
@@ -0,0 +1,42 @@
+{
+ "Name": "deb13",
+ "Timeout": "20m",
+ "Vars": {
+ "gcs_path": {
+ "Required": true
+ },
+ "repo_owner": {
+ "Required": true
+ },
+ "repo_name": {
+ "Required": true
+ },
+ "git_ref": {
+ "Required": true
+ },
+ "version": {
+ "Required": true
+ },
+ "build_dir": {
+ "Required": true
+ }
+ },
+ "Steps": {
+ "build-package": {
+ "Timeout": "20m",
+ "SubWorkflow": {
+ "Path": "./build_package.wf.json",
+ "Vars": {
+ "type": "deb",
+ "sourceImage":
"projects/debian-cloud/global/images/family/debian-12",
+ "gcs_path": "${gcs_path}",
+ "repo_owner": "${repo_owner}",
+ "repo_name": "${repo_name}",
+ "git_ref": "${git_ref}",
+ "build_dir": "${build_dir}",
+ "version": "${version}"
+ }
+ }
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osconfig-20250703.00/packagebuild/workflows/build_deb13_arm64.wf.json
new/osconfig-20250729.00/packagebuild/workflows/build_deb13_arm64.wf.json
--- old/osconfig-20250703.00/packagebuild/workflows/build_deb13_arm64.wf.json
1970-01-01 01:00:00.000000000 +0100
+++ new/osconfig-20250729.00/packagebuild/workflows/build_deb13_arm64.wf.json
2025-07-29 12:04:47.000000000 +0200
@@ -0,0 +1,44 @@
+{
+ "Name": "deb13",
+ "Timeout": "20m",
+ "Vars": {
+ "gcs_path": {
+ "Required": true
+ },
+ "repo_owner": {
+ "Required": true
+ },
+ "repo_name": {
+ "Required": true
+ },
+ "git_ref": {
+ "Required": true
+ },
+ "version": {
+ "Required": true
+ },
+ "build_dir": {
+ "Required": true
+ }
+ },
+ "Steps": {
+ "build-package": {
+ "Timeout": "20m",
+ "SubWorkflow": {
+ "Path": "./build_package.wf.json",
+ "Vars": {
+ "type": "deb",
+ "sourceImage":
"projects/debian-cloud/global/images/family/debian-12-arm64",
+ "gcs_path": "${gcs_path}",
+ "repo_owner": "${repo_owner}",
+ "repo_name": "${repo_name}",
+ "git_ref": "${git_ref}",
+ "build_dir": "${build_dir}",
+ "machine_type": "t2a-standard-2",
+ "zone": "us-central1-a",
+ "version": "${version}"
+ }
+ }
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osconfig-20250703.00/packagebuild/workflows/build_el10.wf.json
new/osconfig-20250729.00/packagebuild/workflows/build_el10.wf.json
--- old/osconfig-20250703.00/packagebuild/workflows/build_el10.wf.json
1970-01-01 01:00:00.000000000 +0100
+++ new/osconfig-20250729.00/packagebuild/workflows/build_el10.wf.json
2025-07-29 12:04:47.000000000 +0200
@@ -0,0 +1,42 @@
+{
+ "Name": "el10",
+ "Timeout": "40m",
+ "Vars": {
+ "gcs_path": {
+ "Required": true
+ },
+ "repo_owner": {
+ "Required": true
+ },
+ "repo_name": {
+ "Required": true
+ },
+ "git_ref": {
+ "Required": true
+ },
+ "version": {
+ "Required": true
+ },
+ "build_dir": {
+ "Required": true
+ }
+ },
+ "Steps": {
+ "build-package": {
+ "Timeout": "40m",
+ "SubWorkflow": {
+ "Path": "./build_package.wf.json",
+ "Vars": {
+ "type": "rpm",
+ "sourceImage": "projects/rhel-cloud/global/images/family/rhel-9",
+ "gcs_path": "${gcs_path}",
+ "repo_owner": "${repo_owner}",
+ "repo_name": "${repo_name}",
+ "git_ref": "${git_ref}",
+ "build_dir": "${build_dir}",
+ "version": "${version}"
+ }
+ }
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osconfig-20250703.00/packagebuild/workflows/build_el10_arm64.wf.json
new/osconfig-20250729.00/packagebuild/workflows/build_el10_arm64.wf.json
--- old/osconfig-20250703.00/packagebuild/workflows/build_el10_arm64.wf.json
1970-01-01 01:00:00.000000000 +0100
+++ new/osconfig-20250729.00/packagebuild/workflows/build_el10_arm64.wf.json
2025-07-29 12:04:47.000000000 +0200
@@ -0,0 +1,44 @@
+{
+ "Name": "el10",
+ "Timeout": "20m",
+ "Vars": {
+ "gcs_path": {
+ "Required": true
+ },
+ "repo_owner": {
+ "Required": true
+ },
+ "repo_name": {
+ "Required": true
+ },
+ "git_ref": {
+ "Required": true
+ },
+ "version": {
+ "Required": true
+ },
+ "build_dir": {
+ "Required": true
+ }
+ },
+ "Steps": {
+ "build-package": {
+ "Timeout": "20m",
+ "SubWorkflow": {
+ "Path": "./build_package.wf.json",
+ "Vars": {
+ "type": "rpm",
+ "sourceImage":
"projects/rhel-cloud/global/images/family/rhel-9-arm64",
+ "gcs_path": "${gcs_path}",
+ "repo_owner": "${repo_owner}",
+ "repo_name": "${repo_name}",
+ "git_ref": "${git_ref}",
+ "build_dir": "${build_dir}",
+ "machine_type": "t2a-standard-2",
+ "zone": "us-central1-a",
+ "version": "${version}"
+ }
+ }
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20250703.00/policies/recipes/artifacts.go
new/osconfig-20250729.00/policies/recipes/artifacts.go
--- old/osconfig-20250703.00/policies/recipes/artifacts.go 2025-07-03
15:05:19.000000000 +0200
+++ new/osconfig-20250729.00/policies/recipes/artifacts.go 2025-07-29
12:04:47.000000000 +0200
@@ -24,10 +24,13 @@
"path/filepath"
"cloud.google.com/go/storage"
+ "github.com/GoogleCloudPlatform/osconfig/agentconfig"
"github.com/GoogleCloudPlatform/osconfig/clog"
"github.com/GoogleCloudPlatform/osconfig/external"
"github.com/GoogleCloudPlatform/osconfig/util"
+ "google.golang.org/api/option"
+
"cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb"
)
@@ -55,8 +58,7 @@
case artifact.GetGcs() != nil:
gcs := artifact.GetGcs()
extension = path.Ext(gcs.Object)
-
- cl, err := storage.NewClient(ctx)
+ cl, err := storage.NewClient(ctx,
option.WithUniverseDomain(agentconfig.UniverseDomain()))
if err != nil {
return "", fmt.Errorf("error creating gcs client: %v",
err)
}
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/google-osconfig-agent/vendor.tar.gz
/work/SRC/openSUSE:Factory/.google-osconfig-agent.new.1085/vendor.tar.gz
differ: char 19, line 1
