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 2022-08-03 21:16:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-osconfig-agent (Old)
and /work/SRC/openSUSE:Factory/.google-osconfig-agent.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-osconfig-agent"
Wed Aug 3 21:16:59 2022 rev:13 rq:992568 version:20220801.00
Changes:
--------
---
/work/SRC/openSUSE:Factory/google-osconfig-agent/google-osconfig-agent.changes
2022-04-14 17:26:27.451332959 +0200
+++
/work/SRC/openSUSE:Factory/.google-osconfig-agent.new.1533/google-osconfig-agent.changes
2022-08-03 21:17:17.819536392 +0200
@@ -1,0 +2,16 @@
+Wed Aug 3 10:25:55 UTC 2022 - John Paul Adrian Glaubitz
<adrian.glaub...@suse.com>
+
+- Update to version 20220801.00 (bsc#1202100, bsc#1202101)
+ * update OWNERS (#438)
+ * Close client when RegisterAgent fails. (#436)
+- from version 20220714.00
+ * Add timeouts for pip/gem updates. (#433)
+- from version 20220623.00
+ * upgrade to golang 1.16 and override deb build settings for compatibility
(#432)
+- from version 20220606.00
+ * new example policy to ensure sshd is running on windows VMs (#430)
+- from version 20220531.00
+ * Add default timeout for pip and gem list commands (#429)
+- Don't restart daemon on package upgrade, create a state file instead
(bsc#1194319)
+
+-------------------------------------------------------------------
Old:
----
osconfig-20220314.01.tar.gz
New:
----
osconfig-20220801.00.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-osconfig-agent.spec ++++++
--- /var/tmp/diff_new_pack.yoMJzo/_old 2022-08-03 21:17:18.579538387 +0200
+++ /var/tmp/diff_new_pack.yoMJzo/_new 2022-08-03 21:17:18.583538397 +0200
@@ -24,7 +24,7 @@
%global import_path %{provider_prefix}
Name: google-osconfig-agent
-Version: 20220314.01
+Version: 20220801.00
Release: 0
Summary: Google Cloud Guest Agent
License: Apache-2.0
@@ -56,6 +56,7 @@
%install
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_sbindir}
+install -d %{buildroot}%{_var}/lib/google_osconfig_agent
install -d %{buildroot}/etc/osconfig
install -p -m 0755 google_osconfig_agent
%{buildroot}%{_bindir}/google_osconfig_agent
install -d %{buildroot}%{_unitdir}
@@ -71,8 +72,14 @@
%post
%service_add_post google-osconfig-agent.service
+ if [ "$1" == "2" ] && ! [ -e /.buildenv ]; then
+ # If the old directory exists make sure we set the file there.
+ [ -e %{_sysconfdir}/osconfig ] && touch
%{_sysconfdir}/osconfig/osconfig_agent_restart_required
+ touch %{_var}/lib/google_osconfig_agent/osconfig_agent_restart_required
+ fi
+
%postun
- %service_del_postun google-osconfig-agent.service
+ %service_del_postun_without_restart google-osconfig-agent.service
%files
%defattr(0644,root,root,0755)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.yoMJzo/_old 2022-08-03 21:17:18.623538502 +0200
+++ /var/tmp/diff_new_pack.yoMJzo/_new 2022-08-03 21:17:18.627538512 +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">20220314.01</param>
- <param name="revision">20220314.01</param>
+ <param name="versionformat">20220801.00</param>
+ <param name="revision">20220801.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-20220314.01.tar.gz</param>
+ <param name="archive">osconfig-20220801.00.tar.gz</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.yoMJzo/_old 2022-08-03 21:17:18.651538575 +0200
+++ /var/tmp/diff_new_pack.yoMJzo/_new 2022-08-03 21:17:18.655538586 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/GoogleCloudPlatform/osconfig</param>
- <param
name="changesrevision">918d1031688a85121704ef568bf8026e8b647b32</param></service></servicedata>
+ <param
name="changesrevision">d4be26f6e2229ebd66d61a741cc4f4c2da0d8287</param></service></servicedata>
(No newline at EOF)
++++++ osconfig-20220314.01.tar.gz -> osconfig-20220801.00.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20220314.01/OWNERS
new/osconfig-20220801.00/OWNERS
--- old/osconfig-20220314.01/OWNERS 2022-03-14 19:59:56.000000000 +0100
+++ new/osconfig-20220801.00/OWNERS 2022-08-01 22:54:46.000000000 +0200
@@ -3,10 +3,7 @@
approvers:
- adjackura
- - ryanwe
reviewers:
- adjackura
- - ryanwe
- - iamsubratp
+ - wrigri
- wj-chen
- - manjunathganga
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osconfig-20220314.01/examples/OSPolicyAssignments/console/win-ensure-openssh.yaml
new/osconfig-20220801.00/examples/OSPolicyAssignments/console/win-ensure-openssh.yaml
---
old/osconfig-20220314.01/examples/OSPolicyAssignments/console/win-ensure-openssh.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/osconfig-20220801.00/examples/OSPolicyAssignments/console/win-ensure-openssh.yaml
2022-08-01 22:54:46.000000000 +0200
@@ -0,0 +1,19 @@
+# An OS policy to ensure sshd is installed and running on windows
+id: win-ensure-openssh-policy
+mode: ENFORCEMENT
+resourceGroups:
+ - resources:
+ id: ensure-ssh
+ exec:
+ validate:
+ interpreter: POWERSHELL
+ script: |
+ $service = Get-Service -Name 'sshd'
+ if ($service.Status -eq 'Running') {exit 100} else {exit 101}
+ enforce:
+ interpreter: POWERSHELL
+ script: |
+ Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
+ Set-Service -Name sshd -StartupType 'Automatic'
+ Start-Service sshd
+ exit 100
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osconfig-20220314.01/examples/OSPolicyAssignments/gcloud/win-ensure-openssh.yaml
new/osconfig-20220801.00/examples/OSPolicyAssignments/gcloud/win-ensure-openssh.yaml
---
old/osconfig-20220314.01/examples/OSPolicyAssignments/gcloud/win-ensure-openssh.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/osconfig-20220801.00/examples/OSPolicyAssignments/gcloud/win-ensure-openssh.yaml
2022-08-01 22:54:46.000000000 +0200
@@ -0,0 +1,31 @@
+# An OS policy to ensure sshd is installed and running on windows
+# only applies to VMs running windows with the label 'ssh' with value
'installed'
+osPolicies:
+ - id: win-ensure-openssh-policy
+ mode: ENFORCEMENT
+ resourceGroups:
+ - resources:
+ id: ensure-ssh
+ exec:
+ validate:
+ interpreter: POWERSHELL
+ script: |
+ $service = Get-Service -Name 'sshd'
+ if ($service.Status -eq 'Running') {exit 100} else {exit 101}
+ enforce:
+ interpreter: POWERSHELL
+ script: |
+ Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
+ Set-Service -Name sshd -StartupType 'Automatic'
+ Start-Service sshd
+ exit 100
+instanceFilter:
+ osShortNames:
+ - windows
+ inclusionLabels:
+ - labels:
+ ssh: installed
+rollout:
+ disruptionBudget:
+ fixed: 10
+ minWaitDuration: 300s
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20220314.01/go.mod
new/osconfig-20220801.00/go.mod
--- old/osconfig-20220314.01/go.mod 2022-03-14 19:59:56.000000000 +0100
+++ new/osconfig-20220801.00/go.mod 2022-08-01 22:54:46.000000000 +0200
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/osconfig
-go 1.13
+go 1.16
require (
cloud.google.com/go v0.95.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20220314.01/main.go
new/osconfig-20220801.00/main.go
--- old/osconfig-20220314.01/main.go 2022-03-14 19:59:56.000000000 +0100
+++ new/osconfig-20220801.00/main.go 2022-08-01 22:54:46.000000000 +0200
@@ -86,8 +86,10 @@
logger.Errorf(err.Error())
} else if err := client.RegisterAgent(ctx); err != nil {
logger.Errorf(err.Error())
+ client.Close()
} else {
// RegisterAgent completed successfully.
+ client.Close()
return
}
time.Sleep(5 * time.Minute)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20220314.01/packages/gem.go
new/osconfig-20220801.00/packages/gem.go
--- old/osconfig-20220314.01/packages/gem.go 2022-03-14 19:59:56.000000000
+0100
+++ new/osconfig-20220801.00/packages/gem.go 2022-08-01 22:54:46.000000000
+0200
@@ -16,9 +16,9 @@
import (
"context"
- "os/exec"
"runtime"
"strings"
+ "time"
"github.com/GoogleCloudPlatform/osconfig/clog"
"github.com/GoogleCloudPlatform/osconfig/util"
@@ -27,8 +27,10 @@
var (
gem string
- gemListArgs = []string{"list", "--local"}
- gemOutdatedArgs = []string{"outdated", "--local"}
+ gemListArgs = []string{"list", "--local"}
+ gemOutdatedArgs = []string{"outdated", "--local"}
+ gemListTimeout = 15 * time.Second
+ gemOutdatedTimeout = 15 * time.Second
)
func init() {
@@ -40,7 +42,7 @@
// GemUpdates queries for all available gem updates.
func GemUpdates(ctx context.Context) ([]*PkgInfo, error) {
- stdout, _, err := runner.Run(ctx, exec.CommandContext(ctx, gem,
gemOutdatedArgs...))
+ stdout, err := runWithDeadline(ctx, gemOutdatedTimeout, gem,
gemOutdatedArgs)
if err != nil {
return nil, err
}
@@ -70,7 +72,7 @@
// InstalledGemPackages queries for all installed gem packages.
func InstalledGemPackages(ctx context.Context) ([]*PkgInfo, error) {
- stdout, _, err := runner.Run(ctx, exec.CommandContext(ctx, gem,
gemListArgs...))
+ stdout, err := runWithDeadline(ctx, gemListTimeout, gem, gemListArgs)
if err != nil {
return nil, err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20220314.01/packages/packages.go
new/osconfig-20220801.00/packages/packages.go
--- old/osconfig-20220314.01/packages/packages.go 2022-03-14
19:59:56.000000000 +0100
+++ new/osconfig-20220801.00/packages/packages.go 2022-08-01
22:54:46.000000000 +0200
@@ -127,6 +127,12 @@
return stdout, nil
}
+func runWithDeadline(ctx context.Context, timeout time.Duration, cmd string,
args []string) ([]byte, error) {
+ ctxWithTimeout, cancel := context.WithTimeout(ctx, timeout)
+ defer cancel()
+ return run(ctxWithTimeout, cmd, args)
+}
+
type ptyRunner struct{}
func (p *ptyRunner) Run(ctx context.Context, cmd *exec.Cmd) ([]byte, []byte,
error) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20220314.01/packages/pip.go
new/osconfig-20220801.00/packages/pip.go
--- old/osconfig-20220314.01/packages/pip.go 2022-03-14 19:59:56.000000000
+0100
+++ new/osconfig-20220801.00/packages/pip.go 2022-08-01 22:54:46.000000000
+0200
@@ -18,6 +18,7 @@
"context"
"encoding/json"
"runtime"
+ "time"
"github.com/GoogleCloudPlatform/osconfig/util"
)
@@ -25,8 +26,10 @@
var (
pip string
- pipListArgs = []string{"list", "--format=json"}
- pipOutdatedArgs = append(pipListArgs, "--outdated")
+ pipListArgs = []string{"list", "--format=json"}
+ pipOutdatedArgs = append(pipListArgs, "--outdated")
+ pipListTimeout = 15 * time.Second
+ pipOutdatedTimeout = 15 * time.Second
)
func init() {
@@ -48,7 +51,7 @@
// PipUpdates queries for all available pip updates.
func PipUpdates(ctx context.Context) ([]*PkgInfo, error) {
- out, err := run(ctx, pip, pipOutdatedArgs)
+ out, err := runWithDeadline(ctx, pipOutdatedTimeout, pip,
pipOutdatedArgs)
if err != nil {
return nil, err
}
@@ -68,7 +71,7 @@
// InstalledPipPackages queries for all installed pip packages.
func InstalledPipPackages(ctx context.Context) ([]*PkgInfo, error) {
- out, err := run(ctx, pip, pipListArgs)
+ out, err := runWithDeadline(ctx, pipListTimeout, pip, pipListArgs)
if err != nil {
return nil, err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osconfig-20220314.01/packaging/debian/rules
new/osconfig-20220801.00/packaging/debian/rules
--- old/osconfig-20220314.01/packaging/debian/rules 2022-03-14
19:59:56.000000000 +0100
+++ new/osconfig-20220801.00/packaging/debian/rules 2022-08-01
22:54:46.000000000 +0200
@@ -8,6 +8,8 @@
export DH_GOLANG_EXCLUDES := e2e_tests/
export CGO_ENABLED := 0
export GO111MODULE := on
+export GOPATH := /usr/share/gocode
+export DH_GOLANG_BUILDPKG := github.com/GoogleCloudPlatform/osconfig
github.com/GoogleCloudPlatform/osconfig/agentconfig
github.com/GoogleCloudPlatform/osconfig/agentendpoint
github.com/GoogleCloudPlatform/osconfig/attributes
github.com/GoogleCloudPlatform/osconfig/clog
github.com/GoogleCloudPlatform/osconfig/external
github.com/GoogleCloudPlatform/osconfig/inventory
github.com/GoogleCloudPlatform/osconfig/osinfo
github.com/GoogleCloudPlatform/osconfig/ospatch
github.com/GoogleCloudPlatform/osconfig/packages
github.com/GoogleCloudPlatform/osconfig/policies
github.com/GoogleCloudPlatform/osconfig/policies/recipes
github.com/GoogleCloudPlatform/osconfig/retryutil
github.com/GoogleCloudPlatform/osconfig/tasker
github.com/GoogleCloudPlatform/osconfig/util
github.com/GoogleCloudPlatform/osconfig/util/mocks
export GOPROXY := https://proxy.golang.org
export GOCACHE := /tmp/.cache
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2022-03-17 09:48:55.650062800 +0100
+++ new/vendor/modules.txt 2022-08-02 12:06:49.000000000 +0200
@@ -1,4 +1,5 @@
# cloud.google.com/go v0.95.0
+## explicit
cloud.google.com/go
cloud.google.com/go/compute/metadata
cloud.google.com/go/iam
@@ -7,23 +8,30 @@
cloud.google.com/go/internal/trace
cloud.google.com/go/internal/version
# cloud.google.com/go/logging v1.4.2
+## explicit
cloud.google.com/go/logging
cloud.google.com/go/logging/apiv2
cloud.google.com/go/logging/internal
# cloud.google.com/go/osconfig v0.2.0
+## explicit
cloud.google.com/go/osconfig/agentendpoint/apiv1
cloud.google.com/go/osconfig/agentendpoint/apiv1beta
# cloud.google.com/go/storage v1.16.1
+## explicit
cloud.google.com/go/storage
cloud.google.com/go/storage/internal/apiv2
# cos.googlesource.com/cos/tools.git v0.0.0-20210329212435-a349a79f950d
+## explicit
cos.googlesource.com/cos/tools.git/src/pkg/cos
cos.googlesource.com/cos/tools.git/src/pkg/utils
# github.com/GoogleCloudPlatform/guest-logging-go
v0.0.0-20210621170517-facc9c0d81b9
+## explicit
github.com/GoogleCloudPlatform/guest-logging-go/logger
# github.com/StackExchange/wmi v1.2.1
+## explicit
github.com/StackExchange/wmi
# github.com/go-ole/go-ole v1.2.5
+## explicit
github.com/go-ole/go-ole
github.com/go-ole/go-ole/oleutil
# github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
@@ -31,6 +39,7 @@
# github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
github.com/golang/groupcache/lru
# github.com/golang/mock v1.6.0
+## explicit
github.com/golang/mock/gomock
# github.com/golang/protobuf v1.5.2
github.com/golang/protobuf/jsonpb
@@ -42,6 +51,7 @@
github.com/golang/protobuf/ptypes/struct
github.com/golang/protobuf/ptypes/timestamp
# github.com/google/go-cmp v0.5.6
+## explicit
github.com/google/go-cmp/cmp
github.com/google/go-cmp/cmp/cmpopts
github.com/google/go-cmp/cmp/internal/diff
@@ -54,18 +64,24 @@
github.com/googleapis/gax-go/v2/apierror/internal/proto
# github.com/julienschmidt/httprouter v1.3.0
github.com/julienschmidt/httprouter
+# github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
+## explicit
# github.com/pkg/errors v0.9.1
github.com/pkg/errors
# github.com/sirupsen/logrus v1.8.1
+## explicit
github.com/sirupsen/logrus
# github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
+## explicit
github.com/tarm/serial
# github.com/ulikunitz/xz v0.5.10
+## explicit
github.com/ulikunitz/xz
github.com/ulikunitz/xz/internal/hash
github.com/ulikunitz/xz/internal/xlog
github.com/ulikunitz/xz/lzma
# go.chromium.org/luci v0.0.0-20201204084249-3e81ee3e83fe
+## explicit
go.chromium.org/luci/common/clock
go.chromium.org/luci/common/data/stringset
go.chromium.org/luci/common/data/text/indented
@@ -102,6 +118,7 @@
go.opencensus.io/trace/propagation
go.opencensus.io/trace/tracestate
# golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
+## explicit
golang.org/x/crypto/cast5
golang.org/x/crypto/openpgp
golang.org/x/crypto/openpgp/armor
@@ -110,6 +127,7 @@
golang.org/x/crypto/openpgp/packet
golang.org/x/crypto/openpgp/s2k
# golang.org/x/net v0.0.0-20210917221730-978cfadd31cf
+## explicit
golang.org/x/net/context
golang.org/x/net/context/ctxhttp
golang.org/x/net/http/httpguts
@@ -119,6 +137,7 @@
golang.org/x/net/internal/timeseries
golang.org/x/net/trace
# golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
+## explicit
golang.org/x/oauth2
golang.org/x/oauth2/authhandler
golang.org/x/oauth2/google
@@ -129,6 +148,7 @@
# golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sync/semaphore
# golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7
+## explicit
golang.org/x/sys/internal/unsafeheader
golang.org/x/sys/unix
golang.org/x/sys/windows
@@ -144,6 +164,7 @@
golang.org/x/xerrors
golang.org/x/xerrors/internal
# google.golang.org/api v0.57.0
+## explicit
google.golang.org/api/googleapi
google.golang.org/api/googleapi/transport
google.golang.org/api/internal
@@ -174,6 +195,7 @@
google.golang.org/appengine/socket
google.golang.org/appengine/urlfetch
# google.golang.org/genproto v0.0.0-20210923133937-385e58f4e555
+## explicit
google.golang.org/genproto/googleapis/api
google.golang.org/genproto/googleapis/api/annotations
google.golang.org/genproto/googleapis/api/distribution
@@ -193,6 +215,7 @@
google.golang.org/genproto/googleapis/type/expr
google.golang.org/genproto/protobuf/field_mask
# google.golang.org/grpc v1.40.0
+## explicit
google.golang.org/grpc
google.golang.org/grpc/attributes
google.golang.org/grpc/backoff
@@ -251,6 +274,7 @@
google.golang.org/grpc/tap
google.golang.org/grpc/test/bufconn
# google.golang.org/protobuf v1.27.1
+## explicit
google.golang.org/protobuf/encoding/protojson
google.golang.org/protobuf/encoding/prototext
google.golang.org/protobuf/encoding/protowire
