From 4166b9f00ed771c96b1fdea35654a89e71fc5d4f Mon Sep 17 00:00:00 2001 From: Levi Blackstone Date: Tue, 4 Jan 2022 17:23:58 -0700 Subject: [PATCH] Change await log type to cloud-ready-check lib The cloud-ready-check library includes an identical logging.Message type definition, so remove the type from the provider and update all references to use the external type instead. --- CHANGELOG.md | 2 + provider/go.mod | 1 + provider/go.sum | 23 ++-- provider/pkg/await/awaiters.go | 7 +- provider/pkg/await/deployment.go | 20 +++- provider/pkg/await/deployment_test.go | 14 ++- provider/pkg/await/job.go | 8 +- provider/pkg/await/pod.go | 16 ++- provider/pkg/await/service.go | 13 ++- provider/pkg/await/statefulset.go | 21 +++- provider/pkg/await/states/job.go | 2 +- provider/pkg/await/states/pod.go | 4 +- provider/pkg/await/states/types.go | 4 +- provider/pkg/await/states/util_test.go | 4 +- provider/pkg/await/watchers.go | 9 +- provider/pkg/logging/dedup_logger.go | 9 +- provider/pkg/logging/time_ordered_log_set.go | 16 +-- .../pkg/logging/time_ordered_log_set_test.go | 35 +++--- provider/pkg/logging/types.go | 102 ------------------ tests/go.sum | 23 ++-- 20 files changed, 152 insertions(+), 181 deletions(-) delete mode 100644 provider/pkg/logging/types.go diff --git a/CHANGELOG.md b/CHANGELOG.md index d03600e015..49de79f6c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## HEAD (Unreleased) +- Change await log type to cloud-ready-check lib (https://github.com/pulumi/pulumi-kubernetes/pull/1855) + ## 3.12.2 (January 5, 2022) - Relax ingress await restrictions (https://github.com/pulumi/pulumi-kubernetes/pull/1832) diff --git a/provider/go.mod b/provider/go.mod index 9ae5a8e9b3..bf7232619a 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -10,6 +10,7 @@ require ( github.com/imdario/mergo v0.3.12 github.com/mitchellh/mapstructure v1.4.1 github.com/pkg/errors v0.9.1 + github.com/pulumi/cloud-ready-checks v1.0.1-0.20220105213132-0fbbc00d3335 github.com/pulumi/pulumi/pkg/v3 v3.19.0 github.com/pulumi/pulumi/sdk/v3 v3.19.0 github.com/stretchr/testify v1.7.0 diff --git a/provider/go.sum b/provider/go.sum index af64add8d4..5623df201d 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -401,8 +401,9 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -679,8 +680,9 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= @@ -824,8 +826,9 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= @@ -946,6 +949,8 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/pulumi/cloud-ready-checks v1.0.1-0.20220105213132-0fbbc00d3335 h1:Lujy/rTbyRE1ZM8bkwm26Q1THtUELJ/Zy36BMlPzk+A= +github.com/pulumi/cloud-ready-checks v1.0.1-0.20220105213132-0fbbc00d3335/go.mod h1:C6HmNtth9oPAWKyRJveZSU4rK/tvzhSGuoOV5y+S17g= github.com/pulumi/pulumi/pkg/v3 v3.19.0 h1:4n4M0sk25Iaij6qdzTKE5WCw7Jt6ykbQj089xrs5AxY= github.com/pulumi/pulumi/pkg/v3 v3.19.0/go.mod h1:EYJ0EUzwpGGavDRlb8gDtK64JMz1XuFAmlCIcHWW0w0= github.com/pulumi/pulumi/sdk/v3 v3.19.0 h1:nNJQQtXEK8rj/iM4mergHRneVl7GSHe0hK/2MvV7kbo= @@ -1277,8 +1282,9 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210420210106-798c2154c571/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210505214959-0714010a04ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1404,8 +1410,9 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= @@ -1417,8 +1424,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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= @@ -1728,8 +1736,9 @@ k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= +k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82qaFC0H/NKxv2e5mbqsgR80= diff --git a/provider/pkg/await/awaiters.go b/provider/pkg/await/awaiters.go index c508dfadd8..365c6e811f 100644 --- a/provider/pkg/await/awaiters.go +++ b/provider/pkg/await/awaiters.go @@ -1,4 +1,4 @@ -// Copyright 2016-2018, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import ( "reflect" "time" + checkerlog "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/metadata" @@ -55,10 +56,10 @@ type createAwaitConfig struct { } func (cac *createAwaitConfig) logStatus(sev diag.Severity, message string) { - cac.logMessage(logging.Message{S: message, Severity: sev}) + cac.logMessage(checkerlog.Message{S: message, Severity: sev}) } -func (cac *createAwaitConfig) logMessage(message logging.Message) { +func (cac *createAwaitConfig) logMessage(message checkerlog.Message) { cac.logger.LogMessage(message) } diff --git a/provider/pkg/await/deployment.go b/provider/pkg/await/deployment.go index f8056b4677..518a8a8e43 100644 --- a/provider/pkg/await/deployment.go +++ b/provider/pkg/await/deployment.go @@ -1,4 +1,16 @@ -// Copyright 2021, Pulumi Corporation. All rights reserved. +// Copyright 2016-2022, Pulumi Corporation. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package await @@ -9,11 +21,11 @@ import ( "time" "github.com/pkg/errors" + checkerlog "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/informers" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/states" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/kinds" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/metadata" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/openapi" "github.com/pulumi/pulumi/sdk/v3/go/common/diag" @@ -780,13 +792,13 @@ func (dia *deploymentInitAwaiter) processPersistentVolumeClaimsEvent(event watch dia.checkPersistentVolumeClaimStatus() } -func (dia *deploymentInitAwaiter) aggregatePodErrors() logging.Messages { +func (dia *deploymentInitAwaiter) aggregatePodErrors() checkerlog.Messages { rs, exists := dia.replicaSets[dia.replicaSetGeneration] if !exists { return nil } - var messages logging.Messages + var messages checkerlog.Messages for _, unstructuredPod := range dia.pods { // Filter down to only Pods owned by the active ReplicaSet. if !isOwnedBy(unstructuredPod, rs) { diff --git a/provider/pkg/await/deployment_test.go b/provider/pkg/await/deployment_test.go index a5d47b2135..34d9edd9b8 100644 --- a/provider/pkg/await/deployment_test.go +++ b/provider/pkg/await/deployment_test.go @@ -1,4 +1,16 @@ -// Copyright 2021, Pulumi Corporation. All rights reserved. +// Copyright 2016-2022, Pulumi Corporation. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. // nolint: goconst package await diff --git a/provider/pkg/await/job.go b/provider/pkg/await/job.go index eab057cbfe..c356207567 100644 --- a/provider/pkg/await/job.go +++ b/provider/pkg/await/job.go @@ -1,4 +1,4 @@ -// Copyright 2016-2019, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,9 +19,8 @@ import ( "strings" "time" - "k8s.io/client-go/dynamic/dynamicinformer" - "github.com/pkg/errors" + checkerlog "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/informers" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/states" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients" @@ -33,6 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/dynamic/dynamicinformer" ) // ------------------------------------------------------------------------------------------------ @@ -233,7 +233,7 @@ func (jia *jobInitAwaiter) processJobEvent(event watch.Event) error { return nil } -func (jia *jobInitAwaiter) processPodMessages(messages logging.Messages) { +func (jia *jobInitAwaiter) processPodMessages(messages checkerlog.Messages) { for _, message := range messages { jia.errors.Add(message) diff --git a/provider/pkg/await/pod.go b/provider/pkg/await/pod.go index 81bb534069..5c282b51f7 100644 --- a/provider/pkg/await/pod.go +++ b/provider/pkg/await/pod.go @@ -1,4 +1,16 @@ -// Copyright 2021, Pulumi Corporation. All rights reserved. +// Copyright 2016-2022, Pulumi Corporation. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package await @@ -7,11 +19,11 @@ import ( "time" "github.com/pkg/errors" + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/informers" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/states" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/kinds" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/metadata" logger "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/provider/pkg/await/service.go b/provider/pkg/await/service.go index a666392122..c7590d6316 100644 --- a/provider/pkg/await/service.go +++ b/provider/pkg/await/service.go @@ -9,13 +9,6 @@ import ( "time" "github.com/pkg/errors" - v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/dynamic" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/informers" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/cluster" @@ -25,6 +18,12 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil" logger "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/dynamic" ) // ------------------------------------------------------------------------------------------------ diff --git a/provider/pkg/await/statefulset.go b/provider/pkg/await/statefulset.go index e4f89bb36d..74f92314da 100644 --- a/provider/pkg/await/statefulset.go +++ b/provider/pkg/await/statefulset.go @@ -1,4 +1,16 @@ -// Copyright 2021, Pulumi Corporation. All rights reserved. +// Copyright 2016-2022, Pulumi Corporation. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. package await @@ -8,22 +20,21 @@ import ( "reflect" "time" - "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil" - "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/pkg/errors" + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/informers" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/states" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/kinds" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/metadata" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/openapi" "github.com/pulumi/pulumi/sdk/v3/go/common/diag" + "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil" logger "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" ) diff --git a/provider/pkg/await/states/job.go b/provider/pkg/await/states/job.go index 5f40697070..d6b3970a10 100644 --- a/provider/pkg/await/states/job.go +++ b/provider/pkg/await/states/job.go @@ -17,7 +17,7 @@ package states import ( "fmt" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" diff --git a/provider/pkg/await/states/pod.go b/provider/pkg/await/states/pod.go index 6d7a6e7496..ceef25d2d4 100644 --- a/provider/pkg/await/states/pod.go +++ b/provider/pkg/await/states/pod.go @@ -1,4 +1,4 @@ -// Copyright 2016-2019, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/provider/pkg/await/states/types.go b/provider/pkg/await/states/types.go index 88d71eee42..f56066b41e 100644 --- a/provider/pkg/await/states/types.go +++ b/provider/pkg/await/states/types.go @@ -1,4 +1,4 @@ -// Copyright 2016-2019, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package states import ( "fmt" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/provider/pkg/await/states/util_test.go b/provider/pkg/await/states/util_test.go index 3c2df33954..8f6ac91117 100644 --- a/provider/pkg/await/states/util_test.go +++ b/provider/pkg/await/states/util_test.go @@ -1,4 +1,4 @@ -// Copyright 2016-2019, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ import ( "fmt" "testing" + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/recordings" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/provider/pkg/await/watchers.go b/provider/pkg/await/watchers.go index 91e71fe0ff..62f0fdeb8f 100644 --- a/provider/pkg/await/watchers.go +++ b/provider/pkg/await/watchers.go @@ -1,4 +1,4 @@ -// Copyright 2016-2019, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,18 +17,17 @@ package await import ( "sync" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" - + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/await/states" "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/clients" - "github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/diag" logger "github.com/pulumi/pulumi/sdk/v3/go/common/util/logging" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/tools/cache" ) // PodAggregator tracks status for any Pods related to the owner resource, and writes diff --git a/provider/pkg/logging/dedup_logger.go b/provider/pkg/logging/dedup_logger.go index 1b110817ec..e99585fb69 100644 --- a/provider/pkg/logging/dedup_logger.go +++ b/provider/pkg/logging/dedup_logger.go @@ -1,4 +1,4 @@ -// Copyright 2016-2019, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ import ( "context" "sync" + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi/pkg/v3/resource/provider" "github.com/pulumi/pulumi/sdk/v3/go/common/diag" "github.com/pulumi/pulumi/sdk/v3/go/common/resource" @@ -45,7 +46,7 @@ func NewLogger(ctx context.Context, host *provider.HostClient, urn resource.URN) } // LogMessage adds a message to the log set and flushes the queue to the host. -func (l *DedupLogger) LogMessage(msg Message) { +func (l *DedupLogger) LogMessage(msg logging.Message) { l.EnqueueMessage(msg.Severity, msg.S) l.LogNewMessages() } @@ -55,11 +56,11 @@ func (l *DedupLogger) EnqueueMessage(severity diag.Severity, s string) { l.mux.Lock() defer l.mux.Unlock() - l.messages.Add(Message{s, severity}) + l.messages.Add(logging.Message{S: s, Severity: severity}) } // GetNewMessages returns the list of new messages since last calling GetNewMessages. -func (l *DedupLogger) GetNewMessages() []Message { +func (l *DedupLogger) GetNewMessages() []logging.Message { l.mux.Lock() defer l.mux.Unlock() diff --git a/provider/pkg/logging/time_ordered_log_set.go b/provider/pkg/logging/time_ordered_log_set.go index d4c9442a72..b46f9eee97 100644 --- a/provider/pkg/logging/time_ordered_log_set.go +++ b/provider/pkg/logging/time_ordered_log_set.go @@ -1,4 +1,4 @@ -// Copyright 2016-2019, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,20 +14,24 @@ package logging +import ( + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" +) + // TimeOrderedLogSet stores a temporally-ordered set of log messages. type TimeOrderedLogSet struct { - exists map[Message]bool - Messages Messages + exists map[logging.Message]bool + Messages logging.Messages } // Add appends a message to the time-ordered set. -func (o *TimeOrderedLogSet) Add(msg Message) { +func (o *TimeOrderedLogSet) Add(msg logging.Message) { // Ensure memory has been allocated. if o.exists == nil { - o.exists = make(map[Message]bool) + o.exists = make(map[logging.Message]bool) } if o.Messages == nil { - o.Messages = []Message{} + o.Messages = []logging.Message{} } if !o.exists[msg] { diff --git a/provider/pkg/logging/time_ordered_log_set_test.go b/provider/pkg/logging/time_ordered_log_set_test.go index 2677f54e1d..df6821eac7 100644 --- a/provider/pkg/logging/time_ordered_log_set_test.go +++ b/provider/pkg/logging/time_ordered_log_set_test.go @@ -1,4 +1,4 @@ -// Copyright 2016-2019, Pulumi Corporation. +// Copyright 2016-2022, Pulumi Corporation. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,57 +17,58 @@ package logging import ( "testing" + "github.com/pulumi/cloud-ready-checks/pkg/checker/logging" "github.com/pulumi/pulumi/sdk/v3/go/common/diag" "github.com/stretchr/testify/assert" ) func TestOrderedStringSet_Add(t *testing.T) { - status1 := Message{"foo", diag.Info} - status2 := Message{"bar", diag.Info} - warn1 := Message{"boom", diag.Warning} + status1 := logging.Message{S: "foo", Severity: diag.Info} + status2 := logging.Message{S: "bar", Severity: diag.Info} + warn1 := logging.Message{S: "boom", Severity: diag.Warning} type fields struct { - exists map[Message]bool - Messages []Message + exists map[logging.Message]bool + Messages []logging.Message } type args struct { - msg Message + msg logging.Message } tests := []struct { name string fields fields args args - expect []Message + expect []logging.Message }{ { "add a message to uninitialized struct", fields{}, args{status1}, - []Message{status1}, + []logging.Message{status1}, }, { "add a new message to empty list", - fields{map[Message]bool{}, []Message{}}, + fields{map[logging.Message]bool{}, []logging.Message{}}, args{status1}, - []Message{status1}, + []logging.Message{status1}, }, { "add a new info message to existing list", - fields{map[Message]bool{status1: true}, []Message{status1}}, + fields{map[logging.Message]bool{status1: true}, []logging.Message{status1}}, args{status2}, - []Message{status1, status2}, + []logging.Message{status1, status2}, }, { "add a new warning message to existing list", - fields{map[Message]bool{status1: true}, []Message{status1}}, + fields{map[logging.Message]bool{status1: true}, []logging.Message{status1}}, args{warn1}, - []Message{status1, warn1}, + []logging.Message{status1, warn1}, }, { "add a duplicate string", - fields{map[Message]bool{status1: true}, []Message{status1}}, + fields{map[logging.Message]bool{status1: true}, []logging.Message{status1}}, args{status1}, - []Message{status1}, + []logging.Message{status1}, }, } for _, tt := range tests { diff --git a/provider/pkg/logging/types.go b/provider/pkg/logging/types.go deleted file mode 100644 index 4970bf26ef..0000000000 --- a/provider/pkg/logging/types.go +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2016-2019, Pulumi Corporation. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package logging - -import ( - "github.com/pulumi/pulumi/sdk/v3/go/common/diag" -) - -// Message stores a log string and the severity for the log message. -type Message struct { - S string - Severity diag.Severity -} - -func (m Message) String() string { - return m.S -} - -// Empty returns true if the Message is uninitialized, false otherwise. -func (m Message) Empty() bool { - return len(m.S) == 0 && len(m.Severity) == 0 -} - -// StatusMessage creates a Message with Severity set to Info. -func StatusMessage(msg string) Message { - return Message{S: msg, Severity: diag.Info} -} - -// WarningMessage creates a Message with Severity set to Warning. -func WarningMessage(msg string) Message { - return Message{S: msg, Severity: diag.Warning} -} - -// ErrorMessage creates a Message with Severity set to Error. -func ErrorMessage(msg string) Message { - return Message{S: msg, Severity: diag.Error} -} - -// Messages is a slice of Message types. -type Messages []Message - -// Infos returns Messages with Info severity. -func (m Messages) Infos() Messages { - var messages Messages - for _, message := range m { - if message.Severity == diag.Info { - messages = append(messages, message) - } - } - - return messages -} - -// Warnings returns Messages with Warning severity. -func (m Messages) Warnings() Messages { - var messages Messages - for _, message := range m { - if message.Severity == diag.Warning { - messages = append(messages, message) - } - } - - return messages -} - -// Errors returns Messages with Error severity. -func (m Messages) Errors() Messages { - var messages Messages - for _, message := range m { - if message.Severity == diag.Error { - messages = append(messages, message) - } - } - - return messages -} - -// MessagesWithSeverity returns Messages matching any of the provided Severity levels. -func (m Messages) MessagesWithSeverity(sev ...diag.Severity) Messages { - var messages Messages - for _, message := range m { - for _, s := range sev { - if message.Severity == s { - messages = append(messages, message) - } - } - } - - return messages -} diff --git a/tests/go.sum b/tests/go.sum index c239d6265f..fc5b400cf1 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -476,8 +476,9 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -769,8 +770,9 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= @@ -915,8 +917,9 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= @@ -1051,6 +1054,8 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/pulumi/cloud-ready-checks v1.0.1-0.20220105213132-0fbbc00d3335 h1:Lujy/rTbyRE1ZM8bkwm26Q1THtUELJ/Zy36BMlPzk+A= +github.com/pulumi/cloud-ready-checks v1.0.1-0.20220105213132-0fbbc00d3335/go.mod h1:C6HmNtth9oPAWKyRJveZSU4rK/tvzhSGuoOV5y+S17g= github.com/pulumi/pulumi/pkg/v3 v3.19.0 h1:4n4M0sk25Iaij6qdzTKE5WCw7Jt6ykbQj089xrs5AxY= github.com/pulumi/pulumi/pkg/v3 v3.19.0/go.mod h1:EYJ0EUzwpGGavDRlb8gDtK64JMz1XuFAmlCIcHWW0w0= github.com/pulumi/pulumi/sdk/v3 v3.16.0/go.mod h1:252ou/zAU1g6E8iTwe2Y9ht7pb5BDl2fJlOuAgZCHiA= @@ -1393,8 +1398,9 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210420210106-798c2154c571/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210505214959-0714010a04ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1528,8 +1534,9 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e h1:XMgFehsDnnLGtjvjOfqWSUzt0alpTR1RSEuznObga2c= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= @@ -1541,8 +1548,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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= @@ -1867,8 +1875,9 @@ k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= +k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82qaFC0H/NKxv2e5mbqsgR80=