Skip to content

Commit d5681a0

Browse files
mvsuspmvsusp
authored
Merge pull request aws#122 from awslabs/mvs-win-role-fix
Fixed the roles from all the notebooks
2 parents 495bea9 + 59da58a commit d5681a0

File tree

25 files changed

+67
-69
lines changed

25 files changed

+67
-69
lines changed

‎advanced_functionality/data_distribution_types/data_distribution_types.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
"# Define IAM role\n",
5555
"import boto3\n",
5656
"import re\n",
57-
" \n",
58-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
59-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
57+
"from sagemaker import get_execution_role\n",
58+
"\n",
59+
"role = get_execution_role()"
6060
]
6161
},
6262
{

‎advanced_functionality/handling_kms_encrypted_data/handling_kms_encrypted_data.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
"import pandas as pd\n",
6363
"import numpy as np\n",
6464
"import re\n",
65+
"from sagemaker import get_execution_role\n",
6566
"\n",
6667
"region = boto3.Session().region_name\n",
6768
"\n",
68-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
69-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
69+
"role = get_execution_role()\n",
7070
"\n",
7171
"kms_key_id = '<your-kms-key-id>'\n",
7272
"\n",

‎advanced_functionality/kmeans_bring_your_own_model/kmeans_bring_your_own_model.ipynb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,17 @@
5656
"import boto3\n",
5757
"import re\n",
5858
" \n",
59-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
60-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
59+
"from sagemaker import get_execution_role\n",
60+
"\n",
61+
"role = get_execution_role()"
6162
]
6263
},
6364
{
6465
"cell_type": "code",
6566
"execution_count": null,
66-
"metadata": {},
67+
"metadata": {
68+
"collapsed": true
69+
},
6770
"outputs": [],
6871
"source": [
6972
"import numpy as np\n",

‎advanced_functionality/parquet_to_recordio_protobuf/parquet_to_recordio_protobuf.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"import pandas as pd\n",
4141
"import numpy as np\n",
4242
"import time\n",
43+
"from sagemaker import get_execution_role\n",
4344
"\n",
44-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
45-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
45+
"role = get_execution_role()\n",
4646
"\n",
4747
"bucket = '<S3 bucket>'\n",
4848
"prefix = 'sagemaker/parquet'"

‎advanced_functionality/r_bring_your_own/r_bring_your_own.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
"# Define IAM role\n",
5757
"import boto3\n",
5858
"import re\n",
59-
" \n",
60-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
61-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
59+
"from sagemaker import get_execution_role\n",
60+
"\n",
61+
"role = get_execution_role()"
6262
]
6363
},
6464
{

‎advanced_functionality/scikit_bring_your_own/scikit_bring_your_own.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,13 +327,13 @@
327327
"# Define IAM role\n",
328328
"import boto3\n",
329329
"import re\n",
330-
" \n",
331-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
332-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
333330
"\n",
334331
"import os\n",
335332
"import numpy as np\n",
336-
"import pandas as pd"
333+
"import pandas as pd\n",
334+
"from sagemaker import get_execution_role\n",
335+
"\n",
336+
"role = get_execution_role()"
337337
]
338338
},
339339
{

‎advanced_functionality/xgboost_bring_your_own_model/xgboost_bring_your_own_model.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@
5555
"import boto3\n",
5656
"import re\n",
5757
"import json\n",
58+
"from sagemaker import get_execution_role\n",
5859
"\n",
5960
"region = boto3.Session().region_name\n",
6061
"\n",
61-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
62-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
62+
"role = get_execution_role()\n",
6363
"\n",
6464
"bucket='<s3 bucket>' # put your s3 bucket name here, and create s3 bucket\n",
6565
"prefix = 'sagemaker/xgboost-byo'\n",

‎introduction_to_amazon_algorithms/factorization_machines_mnist/factorization_machines_mnist.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
"# Define IAM role\n",
6767
"import boto3\n",
6868
"import re\n",
69+
"from sagemaker import get_execution_role\n",
6970
"\n",
70-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
71-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
71+
"role = get_execution_role()"
7272
]
7373
},
7474
{

‎introduction_to_amazon_algorithms/imageclassification_caltech/Image-classification-fulltraining.ipynb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,15 @@
4646
{
4747
"cell_type": "code",
4848
"execution_count": null,
49-
"metadata": {
50-
"collapsed": true
51-
},
49+
"metadata": {},
5250
"outputs": [],
5351
"source": [
5452
"%%time\n",
5553
"import boto3\n",
5654
"import re\n",
55+
"from sagemaker import get_execution_role\n",
5756
"\n",
58-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
59-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
57+
"role = get_execution_role()\n",
6058
"\n",
6159
"bucket='<<bucket-name>>' # customize to your bucket\n",
6260
"containers = {'us-west-2': '433757028032.dkr.ecr.us-west-2.amazonaws.com/image-classification:latest',\n",

‎introduction_to_amazon_algorithms/imageclassification_caltech/Image-classification-transfer-learning.ipynb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,15 @@
4545
{
4646
"cell_type": "code",
4747
"execution_count": null,
48-
"metadata": {
49-
"collapsed": true
50-
},
48+
"metadata": {},
5149
"outputs": [],
5250
"source": [
5351
"%%time\n",
5452
"import boto3\n",
5553
"import re\n",
54+
"from sagemaker import get_execution_role\n",
5655
"\n",
57-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
58-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
56+
"role = get_execution_role()\n",
5957
"\n",
6058
"bucket='<<bucket-name>>' # customize to your bucket\n",
6159
"\n",

‎introduction_to_amazon_algorithms/lda_topic_modeling/LDA-Introduction.ipynb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,12 @@
119119
},
120120
"outputs": [],
121121
"source": [
122+
"from sagemaker import get_execution_role\n",
123+
"\n",
124+
"role = get_execution_role()\n",
122125
"bucket = '<your_s3_bucket_name_here>'\n",
123126
"prefix = 'sagemaker/lda_introduction'\n",
124127
"\n",
125-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
126-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
127-
"\n",
128-
"\n",
129128
"print('Training input/output will be stored in {}/{}'.format(bucket, prefix))\n",
130129
"print('\\nIAM Role: {}'.format(role))"
131130
]

‎introduction_to_amazon_algorithms/linear_learner_mnist/linear_learner_mnist.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
"# Define IAM role\n",
6565
"import boto3\n",
6666
"import re\n",
67+
"from sagemaker import get_execution_role\n",
6768
"\n",
68-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
69-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
69+
"role = get_execution_role()"
7070
]
7171
},
7272
{

‎introduction_to_amazon_algorithms/ntm_synthetic/ntm_synthetic.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
"# Define IAM role\n",
6868
"import boto3\n",
6969
"import re\n",
70+
"from sagemaker import get_execution_role\n",
7071
"\n",
71-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
72-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
72+
"role = get_execution_role()"
7373
]
7474
},
7575
{

‎introduction_to_amazon_algorithms/pca_mnist/pca_mnist.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
"# Define IAM role\n",
6969
"import boto3\n",
7070
"import re\n",
71-
" \n",
72-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
73-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
71+
"from sagemaker import get_execution_role\n",
72+
"\n",
73+
"role = get_execution_role()"
7474
]
7575
},
7676
{

‎introduction_to_amazon_algorithms/seq2seq_translation_en-de/SageMaker-Seq2Seq-Translation-English-German.ipynb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@
6161
"source": [
6262
"import boto3\n",
6363
"import re\n",
64+
"from sagemaker import get_execution_role\n",
6465
"\n",
65-
"# Fetch IAM role\n",
66-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
67-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
66+
"role = get_execution_role()"
6867
]
6968
},
7069
{

‎introduction_to_amazon_algorithms/xgboost_abalone/xgboost_abalone.ipynb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,11 @@
5252
"import os\n",
5353
"import boto3\n",
5454
"import re\n",
55+
"from sagemaker import get_execution_role\n",
5556
"\n",
57+
"role = get_execution_role()\n",
5658
"region = boto3.Session().region_name\n",
5759
"\n",
58-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
59-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
60-
"\n",
6160
"bucket='<bucket-name>' # put your s3 bucket name here, and create s3 bucket\n",
6261
"prefix = 'sagemarker/xgboost-regression'\n",
6362
"# customize to your bucket where you have stored the data\n",

‎introduction_to_amazon_algorithms/xgboost_mnist/xgboost_mnist.ipynb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,12 @@
6262
"import copy\n",
6363
"import time\n",
6464
"from time import gmtime, strftime\n",
65+
"from sagemaker import get_execution_role\n",
6566
"\n",
67+
"role = get_execution_role()\n",
6668
"\n",
6769
"region = boto3.Session().region_name\n",
6870
"\n",
69-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
70-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
71-
"\n",
7271
"bucket='<bucket-name>' # put your s3 bucket name here, and create s3 bucket\n",
7372
"prefix = 'sagemarker/xgboost-multiclass-classification'\n",
7473
"# customize to your bucket where you have stored the data\n",

‎introduction_to_applying_machine_learning/breast_cancer_prediction/Breast Cancer Prediction.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
"import os\n",
6464
"import boto3\n",
6565
"import re\n",
66+
"from sagemaker import get_execution_role\n",
6667
"\n",
67-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
68-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
68+
"role = get_execution_role()\n",
6969
"\n",
7070
"bucket = '<your_s3_bucket_name_here>'# enter your s3 bucket where you will copy data and model artifacts\n",
7171
"prefix = 'sagemaker/breast_cancer_prediction' # place to upload training files within the bucket"

‎introduction_to_applying_machine_learning/ensemble_modeling/EnsembleLearnerCensusIncome.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
"import boto3\n",
6969
"import time\n",
7070
"import re\n",
71+
"from sagemaker import get_execution_role\n",
7172
"\n",
72-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
73-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
73+
"role = get_execution_role()\n",
7474
"\n",
7575
"# Now let's define the S3 bucket we'll used for the remainder of this example.\n",
7676
"\n",

‎introduction_to_applying_machine_learning/linear_time_series_forecast/linear_time_series_forecast.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
"# Define IAM role\n",
6262
"import boto3\n",
6363
"import re\n",
64-
" \n",
65-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
66-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
64+
"from sagemaker import get_execution_role\n",
65+
"\n",
66+
"role = get_execution_role()"
6767
]
6868
},
6969
{

‎introduction_to_applying_machine_learning/xgboost_customer_churn/xgboost_customer_churn.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
"# Define IAM role\n",
6060
"import boto3\n",
6161
"import re\n",
62+
"from sagemaker import get_execution_role\n",
6263
"\n",
63-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
64-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
64+
"role = get_execution_role()"
6565
]
6666
},
6767
{

‎introduction_to_applying_machine_learning/xgboost_direct_marketing/xgboost_direct_marketing_sagemaker.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
"# Define IAM role\n",
6464
"import boto3\n",
6565
"import re\n",
66+
"from sagemaker import get_execution_role\n",
6667
"\n",
67-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
68-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
68+
"role = get_execution_role()"
6969
]
7070
},
7171
{

‎scientific_details_of_algorithms/lda_topic_modeling/LDA-Science.ipynb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,13 @@
9999
},
100100
"outputs": [],
101101
"source": [
102+
"from sagemaker import get_execution_role\n",
103+
"\n",
104+
"role = get_execution_role()\n",
105+
"\n",
102106
"bucket = '<your_s3_bucket_name_here>'\n",
103107
"prefix = 'sagemaker/lda_science'\n",
104108
"\n",
105-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
106-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)\n",
107-
"\n",
108109
"\n",
109110
"print('Training input/output will be stored in {}/{}'.format(bucket, prefix))\n",
110111
"print('\\nIAM Role: {}'.format(role))"

‎under_development/mxnet_mnist_byom/mxnet_mnist.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@
6666
"outputs": [],
6767
"source": [
6868
"import boto3, re\n",
69-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
70-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
69+
"from sagemaker import get_execution_role\n",
70+
"\n",
71+
"role = get_execution_role()"
7172
]
7273
},
7374
{

‎under_development/tensorflow_iris_byom/tensorflow_BYOM_iris.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@
4848
"outputs": [],
4949
"source": [
5050
"import boto3, re\n",
51-
"assumed_role = boto3.client('sts').get_caller_identity()['Arn']\n",
52-
"role = re.sub(r'^(.+)sts::(\\d+):assumed-role/(.+?)/.*$', r'\\1iam::\\2:role/\\3', assumed_role)"
51+
"from sagemaker import get_execution_role\n",
52+
"\n",
53+
"role = get_execution_role()"
5354
]
5455
},
5556
{

0 commit comments

Comments
 (0)