Skip to content

Commit 3bf629a

Browse files
mnlumimnlumi
authored
Merge branch 'master' into mnlumi/awsv6
2 parents 789c48c + 9556176 commit 3bf629a

File tree

68 files changed

+441
-408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+441
-408
lines changed

‎.github/workflows/cron.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
162162
aws-region: ${{ env.AWS_REGION }}
163163
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
164-
role-duration-seconds: 3600
164+
role-duration-seconds: 7200
165165
role-session-name: examples@githubActions
166166
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
167167
- name: Checkout Scripts Repo
@@ -305,7 +305,7 @@ jobs:
305305
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
306306
aws-region: ${{ env.AWS_REGION }}
307307
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
308-
role-duration-seconds: 3600
308+
role-duration-seconds: 7200
309309
role-session-name: examples@githubActions
310310
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
311311
- name: Install Latest Stable Pulumi CLI
@@ -454,7 +454,7 @@ jobs:
454454
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
455455
aws-region: ${{ env.AWS_REGION }}
456456
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
457-
role-duration-seconds: 3600
457+
role-duration-seconds: 7200
458458
role-session-name: examples@githubActions
459459
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
460460
- name: Checkout Scripts Repo
@@ -558,7 +558,7 @@ jobs:
558558
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
559559
aws-region: ${{ env.AWS_REGION }}
560560
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
561-
role-duration-seconds: 3600
561+
role-duration-seconds: 7200
562562
role-session-name: examples@githubActions
563563
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
564564
- name: Checkout Scripts Repo

‎.github/workflows/performance_metrics_cron.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
5757
aws-region: ${{ env.AWS_REGION }}
5858
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
59-
role-duration-seconds: 3600
59+
role-duration-seconds: 7200
6060
role-session-name: examples@githubActions
6161
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
6262
- uses: actions/checkout@v2

‎.github/workflows/run-tests-command.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ jobs:
186186
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
187187
aws-region: ${{ env.AWS_REGION }}
188188
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
189-
role-duration-seconds: 3600
189+
role-duration-seconds: 7200
190190
role-session-name: examples@githubActions
191191
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
192192
- name: Checkout Scripts Repo
@@ -334,7 +334,7 @@ jobs:
334334
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
335335
aws-region: ${{ env.AWS_REGION }}
336336
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
337-
role-duration-seconds: 3600
337+
role-duration-seconds: 7200
338338
role-session-name: examples@githubActions
339339
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
340340
- name: Checkout Scripts Repo
@@ -508,7 +508,7 @@ jobs:
508508
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
509509
aws-region: ${{ env.AWS_REGION }}
510510
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
511-
role-duration-seconds: 3600
511+
role-duration-seconds: 7200
512512
role-session-name: examples@githubActions
513513
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
514514
- name: Checkout Scripts Repo
@@ -614,7 +614,7 @@ jobs:
614614
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
615615
aws-region: ${{ env.AWS_REGION }}
616616
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
617-
role-duration-seconds: 3600
617+
role-duration-seconds: 7200
618618
role-session-name: examples@githubActions
619619
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
620620
- name: Checkout Scripts Repo

‎.github/workflows/smoke-test-cli-command.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
159159
aws-region: ${{ env.AWS_REGION }}
160160
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
161-
role-duration-seconds: 3600
161+
role-duration-seconds: 7200
162162
role-session-name: examples@githubActions
163163
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
164164
- name: Checkout Scripts Repo
@@ -270,7 +270,7 @@ jobs:
270270
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
271271
aws-region: ${{ env.AWS_REGION }}
272272
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
273-
role-duration-seconds: 3600
273+
role-duration-seconds: 7200
274274
role-session-name: examples@githubActions
275275
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
276276
- name: Checkout Scripts Repo
@@ -425,7 +425,7 @@ jobs:
425425
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
426426
aws-region: ${{ env.AWS_REGION }}
427427
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
428-
role-duration-seconds: 3600
428+
role-duration-seconds: 7200
429429
role-session-name: examples@githubActions
430430
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
431431
- name: Checkout Scripts Repo
@@ -529,7 +529,7 @@ jobs:
529529
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
530530
aws-region: ${{ env.AWS_REGION }}
531531
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
532-
role-duration-seconds: 3600
532+
role-duration-seconds: 7200
533533
role-session-name: examples@githubActions
534534
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
535535
- name: Checkout Scripts Repo

‎.github/workflows/smoke-test-provider-command.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
159159
aws-region: ${{ env.AWS_REGION }}
160160
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
161-
role-duration-seconds: 3600
161+
role-duration-seconds: 7200
162162
role-session-name: examples@githubActions
163163
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
164164
- name: Checkout Scripts Repo
@@ -270,7 +270,7 @@ jobs:
270270
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
271271
aws-region: ${{ env.AWS_REGION }}
272272
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
273-
role-duration-seconds: 3600
273+
role-duration-seconds: 7200
274274
role-session-name: examples@githubActions
275275
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
276276
- name: Checkout Scripts Repo
@@ -418,7 +418,7 @@ jobs:
418418
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
419419
aws-region: ${{ env.AWS_REGION }}
420420
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
421-
role-duration-seconds: 3600
421+
role-duration-seconds: 7200
422422
role-session-name: examples@githubActions
423423
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
424424
- name: Checkout Scripts Repo
@@ -522,7 +522,7 @@ jobs:
522522
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
523523
aws-region: ${{ env.AWS_REGION }}
524524
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
525-
role-duration-seconds: 3600
525+
role-duration-seconds: 7200
526526
role-session-name: examples@githubActions
527527
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
528528
- name: Checkout Scripts Repo

‎aws-native-java-s3-folder/src/main/java/s3site/App.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private static void stack(Context ctx) {
5555
).build());
5656

5757
ctx.export("bucketName", siteBucket.bucketName());
58-
ctx.export("websiteUrl", siteBucket.websiteURL());
58+
ctx.export("websiteUrl", siteBucket.websiteUrl());
5959
}
6060

6161
private static void forEachFileInTree(String siteDir, BiConsumer<Path, String> consumer) {

‎azure-go-aci/go.mod

+53-44
Original file line numberDiff line numberDiff line change
@@ -3,63 +3,72 @@ module github.com/pulumi/examples/azure-go-aci
33
go 1.18
44

55
require (
6-
github.com/pulumi/pulumi-azure-native-sdk/containerinstance v1.88.1
7-
github.com/pulumi/pulumi-azure-native-sdk/resources v1.88.1
8-
github.com/pulumi/pulumi/sdk/v3 v3.37.2
6+
github.com/pulumi/pulumi-azure-native-sdk/containerinstance/v2 v2.1.1
7+
github.com/pulumi/pulumi-azure-native-sdk/resources/v2 v2.1.1
8+
github.com/pulumi/pulumi/sdk/v3 v3.76.0
99
)
1010

1111
require (
12+
github.com/Microsoft/go-winio v0.5.2 // indirect
13+
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
14+
github.com/acomagu/bufpipe v1.0.3 // indirect
1215
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
16+
github.com/agext/levenshtein v1.2.1 // indirect
17+
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
1318
github.com/blang/semver v3.5.1+incompatible // indirect
14-
github.com/cheggaaa/pb v1.0.18 // indirect
15-
github.com/djherbis/times v1.2.0 // indirect
16-
github.com/emirpasic/gods v1.12.0 // indirect
17-
github.com/fatih/color v1.10.0 // indirect
18-
github.com/gofrs/uuid v3.3.0+incompatible // indirect
19+
github.com/cheggaaa/pb v1.0.29 // indirect
20+
github.com/cloudflare/circl v1.3.3 // indirect
21+
github.com/djherbis/times v1.5.0 // indirect
22+
github.com/emirpasic/gods v1.18.1 // indirect
23+
github.com/go-git/gcfg v1.5.0 // indirect
24+
github.com/go-git/go-billy/v5 v5.4.0 // indirect
25+
github.com/go-git/go-git/v5 v5.6.0 // indirect
1926
github.com/gogo/protobuf v1.3.2 // indirect
20-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
21-
github.com/golang/protobuf v1.4.2 // indirect
27+
github.com/golang/glog v1.1.0 // indirect
28+
github.com/golang/protobuf v1.5.3 // indirect
2229
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
23-
github.com/hashicorp/errwrap v1.0.0 // indirect
24-
github.com/hashicorp/go-multierror v1.0.0 // indirect
25-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
30+
github.com/hashicorp/errwrap v1.1.0 // indirect
31+
github.com/hashicorp/go-multierror v1.1.1 // indirect
32+
github.com/hashicorp/hcl/v2 v2.16.1 // indirect
33+
github.com/imdario/mergo v0.3.13 // indirect
34+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
2635
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
27-
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
28-
github.com/mattn/go-colorable v0.1.8 // indirect
29-
github.com/mattn/go-runewidth v0.0.8 // indirect
30-
github.com/mitchellh/go-homedir v1.1.0 // indirect
36+
github.com/kevinburke/ssh_config v1.2.0 // indirect
37+
github.com/mattn/go-runewidth v0.0.13 // indirect
3138
github.com/mitchellh/go-ps v1.0.0 // indirect
32-
github.com/opentracing/basictracer-go v1.0.0 // indirect
33-
github.com/opentracing/opentracing-go v1.1.0 // indirect
39+
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
40+
github.com/opentracing/basictracer-go v1.1.0 // indirect
41+
github.com/opentracing/opentracing-go v1.2.0 // indirect
42+
github.com/pjbgf/sha1cd v0.3.0 // indirect
3443
github.com/pkg/errors v0.9.1 // indirect
3544
github.com/pkg/term v1.1.0 // indirect
36-
github.com/pulumi/pulumi-azure-native-sdk v1.88.1 // indirect
37-
github.com/rivo/uniseg v0.2.0 // indirect
38-
github.com/rogpeppe/go-internal v1.8.1 // indirect
39-
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect
40-
github.com/sergi/go-diff v1.1.0 // indirect
41-
github.com/spf13/cobra v1.4.0 // indirect
45+
github.com/pulumi/pulumi-azure-native-sdk/v2 v2.1.1 // indirect
46+
github.com/rivo/uniseg v0.4.4 // indirect
47+
github.com/rogpeppe/go-internal v1.9.0 // indirect
48+
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
49+
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
50+
github.com/sergi/go-diff v1.2.0 // indirect
51+
github.com/skeema/knownhosts v1.1.0 // indirect
52+
github.com/spf13/cobra v1.6.1 // indirect
4253
github.com/spf13/pflag v1.0.5 // indirect
43-
github.com/src-d/gcfg v1.4.0 // indirect
44-
github.com/stretchr/testify v1.7.0 // indirect
45-
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6 // indirect
54+
github.com/stretchr/objx v0.5.0 // indirect
55+
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
4656
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
47-
github.com/uber/jaeger-client-go v2.22.1+incompatible // indirect
48-
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
49-
github.com/xanzy/ssh-agent v0.2.1 // indirect
50-
go.uber.org/atomic v1.6.0 // indirect
51-
golang.org/x/crypto v0.1.0 // indirect
52-
golang.org/x/net v0.7.0 // indirect
53-
golang.org/x/sys v0.5.0 // indirect
54-
golang.org/x/term v0.5.0 // indirect
55-
golang.org/x/text v0.7.0 // indirect
56-
google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482 // indirect
57-
google.golang.org/grpc v1.29.1 // indirect
58-
google.golang.org/protobuf v1.24.0 // indirect
59-
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
60-
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
57+
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
58+
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
59+
github.com/xanzy/ssh-agent v0.3.3 // indirect
60+
github.com/zclconf/go-cty v1.12.1 // indirect
61+
go.uber.org/atomic v1.9.0 // indirect
62+
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a // indirect
63+
golang.org/x/net v0.9.0 // indirect
64+
golang.org/x/sys v0.7.0 // indirect
65+
golang.org/x/term v0.7.0 // indirect
66+
golang.org/x/text v0.9.0 // indirect
67+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
68+
google.golang.org/grpc v1.56.1 // indirect
69+
google.golang.org/protobuf v1.30.0 // indirect
6170
gopkg.in/warnings.v0 v0.1.2 // indirect
62-
gopkg.in/yaml.v2 v2.4.0 // indirect
71+
gopkg.in/yaml.v3 v3.0.1 // indirect
6372
lukechampine.com/frand v1.4.2 // indirect
64-
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // indirect
73+
sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 // indirect
6574
)

0 commit comments

Comments
 (0)