Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to azure native sdk v2 #64

Merged
merged 2 commits into from
Sep 1, 2023
Merged

Upgrade to azure native sdk v2 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f616197
Upgrade to azure native sdk v2
fraliv13 Aug 29, 2023
6c9af82
Updated plugin
fraliv13 Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ module totalsoft.ro/platform-controllers
go 1.20

require (
dario.cat/mergo v1.0.0
github.com/blang/semver v3.5.1+incompatible
github.com/fluxcd/helm-controller/api v0.33.0
github.com/google/uuid v1.3.0
github.com/hashicorp/vault/api v1.9.1
github.com/hashicorp/vault/api/auth/kubernetes v0.4.0
github.com/json-iterator/go v1.1.12
github.com/pulumi/pulumi-azure-native-sdk/authorization v1.102.0
github.com/pulumi/pulumi-azure-native-sdk/compute v1.102.0
github.com/pulumi/pulumi-azure-native-sdk/desktopvirtualization v1.102.0
github.com/pulumi/pulumi-azure-native-sdk/network v1.102.0
github.com/pulumi/pulumi-azure-native-sdk/resources v1.102.0
github.com/pulumi/pulumi-azure-native-sdk/sql v1.102.0
github.com/pulumi/pulumi-azure-native-sdk/storage v1.102.0
github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.4.0
github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.4.0
github.com/pulumi/pulumi-azure-native-sdk/desktopvirtualization/v2 v2.4.0
github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.4.0
github.com/pulumi/pulumi-azure-native-sdk/resources/v2 v2.4.0
github.com/pulumi/pulumi-azure-native-sdk/sql/v2 v2.4.0
github.com/pulumi/pulumi-azure-native-sdk/storage/v2 v2.4.0
github.com/pulumi/pulumi-azuread/sdk/v5 v5.38.0
github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.28.1
github.com/pulumi/pulumi-random/sdk/v4 v4.13.2
Expand All @@ -35,7 +36,6 @@ require (
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
Expand Down Expand Up @@ -100,7 +100,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pulumi/pulumi-azure-native-sdk v1.102.0 // indirect
github.com/pulumi/pulumi-azure-native-sdk/v2 v2.4.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
Expand Down
37 changes: 17 additions & 20 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VM
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0AE5csawV4YXMNGNQQXvLRps3z2Z59OPO+I=
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
Expand Down Expand Up @@ -126,7 +124,6 @@ github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU=
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down Expand Up @@ -198,7 +195,7 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
Expand Down Expand Up @@ -241,22 +238,22 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/pulumi/pulumi-azure-native-sdk v1.102.0 h1:m41/4tdFGAeP0OuCyoLjQIF8hJsEHCe955eZlriMoKo=
github.com/pulumi/pulumi-azure-native-sdk v1.102.0/go.mod h1:obUeVSrxzSLakRhsP2om6+QwgVT+E9Dd6VH40jC/AfM=
github.com/pulumi/pulumi-azure-native-sdk/authorization v1.102.0 h1:vuZdeBjtuHsZX8G7xAyoxb1NW3SnNzHfM8az+F7ADGI=
github.com/pulumi/pulumi-azure-native-sdk/authorization v1.102.0/go.mod h1:+2htpBZqQecwZc5ud1XzXMxJ4tZZAQB2b4CO0xXYBXY=
github.com/pulumi/pulumi-azure-native-sdk/compute v1.102.0 h1:uCSGm/zcELIlaPqcIIUDZl04V8fi3p+GmWyUdpRfktA=
github.com/pulumi/pulumi-azure-native-sdk/compute v1.102.0/go.mod h1:uwBlNk2sShjAdwMuseHXWdHRdU0exWlTLeKneYCGRIk=
github.com/pulumi/pulumi-azure-native-sdk/desktopvirtualization v1.102.0 h1:myVEpSAiTEoTkNlrW/WOSYCOZLAPUP1nAveYi4sIFEM=
github.com/pulumi/pulumi-azure-native-sdk/desktopvirtualization v1.102.0/go.mod h1:1jrXu8miA6ss8RT6zMMLDmdLhpAO6dI+EiEUVqveBIg=
github.com/pulumi/pulumi-azure-native-sdk/network v1.102.0 h1:s/pmSpMTD4BmYcXqh5GB0SBIlfD7rE6D3wMfBBsSDfI=
github.com/pulumi/pulumi-azure-native-sdk/network v1.102.0/go.mod h1:JB50kywDXuO5m8zAJlUEBoTr1QFWraq988ABb/3OzWo=
github.com/pulumi/pulumi-azure-native-sdk/resources v1.102.0 h1:5wuksvi/qr5kFoq+xxnQeLmIzE/Fx1Trpc80RO8Jfhs=
github.com/pulumi/pulumi-azure-native-sdk/resources v1.102.0/go.mod h1:SmrWYu9qhUO3tfBZpWAHlttNgQViF8z9iZZUMtay/1I=
github.com/pulumi/pulumi-azure-native-sdk/sql v1.102.0 h1:V2d19q/FmwUwmdoV+35OzMRUCpgrf6lutNNU76mUNYw=
github.com/pulumi/pulumi-azure-native-sdk/sql v1.102.0/go.mod h1:UUmDmU9m3geoBsRH4gsayxX89q+XIKBua5m+V4e1vWU=
github.com/pulumi/pulumi-azure-native-sdk/storage v1.102.0 h1:8DFKu8uRp8qRkMqB7E5yR9eQyimFkoTExTfZbvnzTHY=
github.com/pulumi/pulumi-azure-native-sdk/storage v1.102.0/go.mod h1:ATrfmtrbgKAySmBC96F4xhvyrGrUeGdM3897HSon760=
github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.4.0 h1:rQPHBDx38jfXYtC97lPR25HQoV0Ootyo+rpFrJDgmns=
github.com/pulumi/pulumi-azure-native-sdk/authorization/v2 v2.4.0/go.mod h1:GI2aCYCYrcQHkfEOx7vAknRhhCDwVtlvSbMcyZh6X/k=
github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.4.0 h1:h6SVlNPqa8Spxya7G0obt4NmXQPpYRS/kpJM+eG9Itc=
github.com/pulumi/pulumi-azure-native-sdk/compute/v2 v2.4.0/go.mod h1:eD5kkSSQU2kJbW7telpS9gaM6hiRH4Q8u4lcOpx8jrc=
github.com/pulumi/pulumi-azure-native-sdk/desktopvirtualization/v2 v2.4.0 h1:pz8cmyWEFE4qfGGDBAGMQ35pWckM2OOSxgY1cK9e4JI=
github.com/pulumi/pulumi-azure-native-sdk/desktopvirtualization/v2 v2.4.0/go.mod h1:s7GSMVekCyCrWTEA3aOdVDtOVkIqTW0yrMnWlWG+4V8=
github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.4.0 h1:KrMG6wvPQuBEqbECNotGBWEuhEEoArN9ndcdkKIzWIY=
github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.4.0/go.mod h1:vszGWHBWdeTWzIIHR7ka04NGQh0GHyVK/yhAbtIEnA4=
github.com/pulumi/pulumi-azure-native-sdk/resources/v2 v2.4.0 h1:xqKfg8BZSQxZFrTtj06Qjjro7yyOiep58+N6hszLSJE=
github.com/pulumi/pulumi-azure-native-sdk/resources/v2 v2.4.0/go.mod h1:VF2DtTHrsgcq1fL4k5xthmvIWpv8xmJ8mhxt7xdjZUI=
github.com/pulumi/pulumi-azure-native-sdk/sql/v2 v2.4.0 h1:vTYu1ek0KY97uIu9zrXrMIu6R928r32IxLweaNmfXuc=
github.com/pulumi/pulumi-azure-native-sdk/sql/v2 v2.4.0/go.mod h1:Qa1iE6z0YWVSZu2UdRBrYXiovWxtPZwUMqnH+Xk+Odk=
github.com/pulumi/pulumi-azure-native-sdk/storage/v2 v2.4.0 h1:J50/rghVvvPLqqXZTuPT2SSOb5i6Pz3IauSg+AVxfgM=
github.com/pulumi/pulumi-azure-native-sdk/storage/v2 v2.4.0/go.mod h1:US2qTUMe61g8vaPMq3TRSghRwXWIPBqf2AhpvLpRymw=
github.com/pulumi/pulumi-azure-native-sdk/v2 v2.4.0 h1:8oM/iShYuvTTloUv9vCtPkXwg2paueFlCu3TLQf3PMg=
github.com/pulumi/pulumi-azure-native-sdk/v2 v2.4.0/go.mod h1:0M4mUmmpe41qj02HAGJnLYLpf8TBkrtdqD6H8J9XPo4=
github.com/pulumi/pulumi-azuread/sdk/v5 v5.38.0 h1:rbCLLDpfIyh4Kxf7D9SC94s2bb61zYehxjDC29rfVeQ=
github.com/pulumi/pulumi-azuread/sdk/v5 v5.38.0/go.mod h1:9JQ1BRLOj17vgwNS6EcSmMgCaWiRh7kfSB0MdGCp2rE=
github.com/pulumi/pulumi-kubernetes/sdk/v3 v3.28.1 h1:khqNTTqOYyPs2vM76cREa3brIqFkEqlfgKK3JZGhVY4=
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/provisioning/provisioners/pulumi/azure_db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

azureSql "github.com/pulumi/pulumi-azure-native-sdk/sql"
azureSql "github.com/pulumi/pulumi-azure-native-sdk/sql/v2"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
platformv1 "totalsoft.ro/platform-controllers/pkg/apis/platform/v1alpha1"
provisioningv1 "totalsoft.ro/platform-controllers/pkg/apis/provisioning/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/provisioning/provisioners/pulumi/azure_managed_db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

azureSql "github.com/pulumi/pulumi-azure-native-sdk/sql"
azureSql "github.com/pulumi/pulumi-azure-native-sdk/sql/v2"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
platformv1 "totalsoft.ro/platform-controllers/pkg/apis/platform/v1alpha1"
provisioningv1 "totalsoft.ro/platform-controllers/pkg/apis/provisioning/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/provisioning/provisioners/pulumi/azure_resource_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package pulumi
import (
"fmt"

azureResources "github.com/pulumi/pulumi-azure-native-sdk/resources"
azureResources "github.com/pulumi/pulumi-azure-native-sdk/resources/v2"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
platformv1 "totalsoft.ro/platform-controllers/pkg/apis/platform/v1alpha1"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/controllers/provisioning/provisioners/pulumi/azure_virtual_desktop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strings"
"time"

"github.com/pulumi/pulumi-azure-native-sdk/authorization"
"github.com/pulumi/pulumi-azure-native-sdk/compute"
"github.com/pulumi/pulumi-azure-native-sdk/desktopvirtualization"
"github.com/pulumi/pulumi-azure-native-sdk/network"
"github.com/pulumi/pulumi-azure-native-sdk/storage"
"github.com/pulumi/pulumi-azure-native-sdk/authorization/v2"
"github.com/pulumi/pulumi-azure-native-sdk/compute/v2"
"github.com/pulumi/pulumi-azure-native-sdk/desktopvirtualization/v2"
"github.com/pulumi/pulumi-azure-native-sdk/network/v2"
"github.com/pulumi/pulumi-azure-native-sdk/storage/v2"
"github.com/pulumi/pulumi-azuread/sdk/v5/go/azuread"
"github.com/pulumi/pulumi-random/sdk/v4/go/random"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
Expand Down
4 changes: 2 additions & 2 deletions internal/controllers/provisioning/provisioners/pulumi/azure_virtual_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"math"
"strings"

compute "github.com/pulumi/pulumi-azure-native-sdk/compute"
"github.com/pulumi/pulumi-azure-native-sdk/network"
compute "github.com/pulumi/pulumi-azure-native-sdk/compute/v2"
"github.com/pulumi/pulumi-azure-native-sdk/network/v2"
"github.com/pulumi/pulumi-random/sdk/v4/go/random"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
platformv1 "totalsoft.ro/platform-controllers/pkg/apis/platform/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/provisioning/provisioners/pulumi/pulumi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func createOrSelectStack(ctx context.Context, stackName, projectName string, dep
w := s.Workspace()

// for inline source programs, we must manage plugins ourselves
err = w.InstallPlugin(ctx, "azure-native", "v1.102.0")
err = w.InstallPlugin(ctx, "azure-native", "v2.4.0")
if err != nil {
klog.Errorf("Failed to install azure-native plugin: %v", err)
return auto.Stack{}, err
Expand Down