adjust cos scripts to set instance properly

Author: jeremiaswerner

beta/serverless-fleets/download

@@ -2,10 +2,14 @@
 
 # get the current resource group name
 resource_group_name=$(ibmcloud target -o JSON | jq -r '.resource_group.name')
+cos_instance=${resource_group_name/--rg/}--cos
+
+echo "switching to COS instance $cos_instance"
 
 # configure the COS instance
-crn=$(ibmcloud resource service-instances -o json | jq -r '.[] | select( .name | contains("--cos")) | .crn')
-ibmcloud cos config crn --crn $crn
+crn=$(ibmcloud resource service-instance "${cos_instance}" -o json | jq -r '.[] | .crn')
+
+ibmcloud cos config crn --crn $crn --force
 
 # get the bucket names
 output_bucket=$(ibmcloud cos buckets --json | jq -r '.Buckets[] | select( .Name | contains("output")) | .Name')

beta/serverless-fleets/upload

@@ -2,10 +2,14 @@
 
 # get the current resource group name
 resource_group_name=$(ibmcloud target -o JSON | jq -r '.resource_group.name')
+cos_instance=${resource_group_name/--rg/}--cos
+
+echo "switching to COS instance $cos_instance"
 
 # configure the COS instance
-crn=$(ibmcloud resource service-instances -o json | jq -r '.[] | select( .name | contains("--cos")) | .crn')
-ibmcloud cos config crn --crn $crn
+crn=$(ibmcloud resource service-instance "${cos_instance}" -o json | jq -r '.[] | .crn')
+
+ibmcloud cos config crn --crn $crn --force
 
 # get the bucket names
 output_bucket=$(ibmcloud cos buckets --json | jq -r '.Buckets[] | select( .Name | contains("output")) | .Name')

beta/serverless-fleets/watch_results

@@ -1,7 +1,20 @@
 #!/bin/sh
 
-crn=$(ibmcloud resource service-instances -o json | jq -r '.[] | select( .name | contains("--cos")) | .crn')
-ibmcloud cos config crn --crn $crn
+# get the current resource group name
+resource_group_name=$(ibmcloud target -o JSON | jq -r '.resource_group.name')
+region=$(ibmcloud target -o JSON | jq -r '.region.name')
+cos_instance=${resource_group_name/--rg/}--cos
+
+echo "switching to COS instance $cos_instance"
+
+# configure the COS instance
+crn=$(ibmcloud resource service-instance "${cos_instance}" -o json | jq -r '.[] | .crn')
+
+ibmcloud cos config crn --crn $crn --force
+ibmcloud cos config endpoint-url --url s3.$region.cloud-object-storage.appdomain.cloud 
+
 bucket=$(ibmcloud cos buckets --json | jq -r '.Buckets[] | select( .Name | contains("output")) | .Name')
 
+echo $bucket
+
 watch -n 2 ibmcloud cos list-objects-v2 --bucket "$bucket" --prefix "$1"