@@ -48,24 +48,22 @@ source ${SCRIPT_DIR}/common.sh
4848# Clean up previous run
4949function clean() {
5050 (
51+ target_region $REGION
52+ target_resource_group $resource_group_name
53+
5154 rm -f ${sshkey_name}
5255 rm -f ${sshkey_name} .pub
5356
54-
55- ibmcloud resource service-instance-delete $icl_name -f -q 2> /dev/null
56- ibmcloud iam service-id-delete ${icl_name} -svc-id -f -q 2> /dev/null
57- ibmcloud is endpoint-gateway-delete ${icl_name} -vpegw --force 2> /dev/null
58-
5957 if [[ " $SETUP_MONITORING " == " true" ]]; then
6058 ibmcloud resource service-key-delete ${sysdig_key_name} -f -q 2> /dev/null
61- ibmcloud resource service-instance-delete ${sysdig_name} -f -q 2> /dev/null
59+ ibmcloud resource service-instance-delete ${sysdig_name} -g ${resource_group_name} - f -q 2> /dev/null
6260 ibmcloud is endpoint-gateway-delete ${sysdig_name} -vpegw --force 2> /dev/null
6361 fi
6462
6563 if [[ " $SETUP_LOGGING " == " true" ]]; then
66- ibmcloud iam service-id-delete ${icl_name} -svc-id 2> /dev/null
64+ ibmcloud iam service-id-delete ${icl_name} -svc-id -f 2> /dev/null
6765 ibmcloud is endpoint-gateway-delete ${icl_name} -vpegw --force 2> /dev/null
68- ibmcloud resource service-instance-delete $icl_name -f -q 2> /dev/null
66+ ibmcloud resource service-instance-delete $icl_name -g ${resource_group_name} - f -q 2> /dev/null
6967 fi
7068
7169 ibmcloud iam api-key-delete ${apikey_name} --force 2> /dev/null
@@ -172,7 +170,6 @@ ensure_plugin_is_up_to_date vpc-infrastructure
172170ensure_plugin_is_up_to_date cloud-object-storage
173171ensure_plugin_is_up_to_date container-registry
174172
175- print_msg " \nTargetting IBM Cloud region '$REGION ' ..."
176173target_region $REGION
177174
178175#
@@ -361,13 +358,17 @@ ibmcloud cos config region --region $REGION
361358print_msg " \nCreating COS bucket '${cos_bucket_name} ' ..."
362359ibmcloud cos bucket-create --bucket ${cos_bucket_name} --ibm-service-instance-id $COS_ID
363360
364-
365361# Create COS credentials
366362print_msg " \nCreating COS service key '${cos_key_name} ' ..."
367363ibmcloud resource service-key-create ${cos_key_name} --parameters ' {"HMAC":true}' --instance-id $COS_ID
368364
369365print_msg " \nCOS instance '${COS_ID} ' and bucket '${cos_bucket_name} ' created ..."
370366
367+ ibmcloud cos config crn --force --crn $( ibmcloud resource service-instance $cos_name --crn | grep " crn" )
368+
369+ print_msg " \ncreateing bucket lifecycle configuration for objects in the result folder with 1 day retention ..."
370+ ibmcloud cos bucket-lifecycle-configuration-put --bucket ${cos_bucket_name} --region ${REGION} --lifecycle-configuration ' { "Rules": [ {"Expiration": {"Days": 1},"Filter": {"Prefix": "result/ticker"},"ID": "ticker results","Status": "Enabled"}, {"Expiration": {"Days": 1},"Filter": {"Prefix": "result/inferencing"},"ID": "inferencing results","Status": "Enabled"}, {"Expiration": {"Days": 1},"Filter": {"Prefix": "result/docling"},"ID": "docling results","Status": "Enabled"}, {"Expiration": {"Days": 1},"Filter": {"Prefix": "result/wordcount"},"ID": "wordcount results","Status": "Enabled"} ] }'
371+
371372print_msg " \nCreating local rclone environment .rclone.conf to upload/download to the COS bucket..."
372373
373374cat > .rclone.conf << EOF
0 commit comments