Skip to content

Commit 95fe3b3

Browse files
gregversgregvers
authored
Merge pull request #4 from oracle/Updated_FDK_SDK_versions
Updated java fdk version, java sdk version and policies
2 parents f431a9d + b261a02 commit 95fe3b3

File tree

19 files changed

+50
-45
lines changed

19 files changed

+50
-45
lines changed

‎oci-list-instances-java/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ALL {resource.type = 'fnfunc', resource.compartment.id = 'ocid1.compartment.oc1.
4646

4747
## Create or Update IAM Policies
4848

49-
Create a new policy that allows the dynamic group to inspect `instance-family` in
49+
Create a new policy that allows the dynamic group to `inspect instances` in
5050
the functions related compartment.
5151

5252
![user input icon](../images/userinput.png)

‎oci-list-instances-java/func.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ schema_version: 20180708
22
name: oci-list-instances-java
33
version: 0.0.3
44
runtime: java
5-
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.105
6-
run_image: fnproject/fn-java-fdk:jre11-1.0.105
5+
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.108
6+
run_image: fnproject/fn-java-fdk:jre11-1.0.108
77
cmd: com.example.fn.ComputeInstancesList::handle
88
timeout: 120

‎oci-list-instances-java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<properties>
77
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8-
<fdk.version>1.0.105</fdk.version>
8+
<fdk.version>1.0.108</fdk.version>
99
</properties>
1010
<groupId>com.example.fn</groupId>
1111
<artifactId>oci-list-instances</artifactId>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.oracle.oci.sdk</groupId>
3131
<artifactId>oci-java-sdk-bom</artifactId>
32-
<version>1.13.2</version>
32+
<version>1.17.0</version>
3333
<type>pom</type>
3434
<scope>import</scope>
3535
</dependency>

‎oci-list-instances-python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ALL {resource.type = 'fnfunc', resource.compartment.id = 'ocid1.compartment.oc1.
4646

4747
## Create or Update IAM Policies
4848

49-
Create a new policy that allows the dynamic group to inspect `instances` in
49+
Create a new policy that allows the dynamic group to `inspect instances` in
5050
the functions related compartment.
5151

5252
![user input icon](../images/userinput.png)

‎oci-objectstorage-get-object-java/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ ALL {resource.type = 'fnfunc', resource.compartment.id = 'ocid1.compartment.oc1.
5050

5151

5252
## Create or Update IAM Policies
53-
Create a new policy that allows the dynamic group to read `object-family` in
53+
Create a new policy that allows the dynamic group to `read objects` in
5454
the functions related compartment.
5555

5656
![user input icon](../images/userinput.png)
5757

5858
Your policy should look something like this:
5959
```
60-
Allow dynamic-group <dynamic-group-name> to read object-family in compartment <compartment-name>
60+
Allow dynamic-group <dynamic-group-name> to read objects in compartment <compartment-name>
6161
```
6262
e.g.
6363
```
64-
Allow dynamic-group demo-func-dyn-group to read object-family in compartment demo-func-compartment
64+
Allow dynamic-group demo-func-dyn-group to read objects in compartment demo-func-compartment
6565
```
6666
For more information on how to create policies, go [here](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/policysyntax.htm).
6767

@@ -105,7 +105,7 @@ fn config app <app-name> NAMESPACE <object-storage-namespace>
105105
```
106106
e.g.
107107
```
108-
fn config app myapp NAMESPACE mytenancy
108+
fn config app myapp NAMESPACE myobjnamespace
109109
```
110110

111111
Note that the config value can also be set at the function level.

‎oci-objectstorage-get-object-java/func.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ schema_version: 20180708
22
name: oci-objectstorage-get-object-java
33
version: 0.0.1
44
runtime: java
5-
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.105
6-
run_image: fnproject/fn-java-fdk:jre11-1.0.105
5+
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.108
6+
run_image: fnproject/fn-java-fdk:jre11-1.0.108
77
cmd: com.example.fn.ObjectStorageGetObject::handle
88
timeout: 120

‎oci-objectstorage-get-object-java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<properties>
77
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8-
<fdk.version>1.0.105</fdk.version>
8+
<fdk.version>1.0.108</fdk.version>
99
</properties>
1010
<groupId>com.example.fn</groupId>
1111
<artifactId>oci-objectstorage-get-object</artifactId>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.oracle.oci.sdk</groupId>
3131
<artifactId>oci-java-sdk-bom</artifactId>
32-
<version>1.13.2</version>
32+
<version>1.17.0</version>
3333
<type>pom</type>
3434
<scope>import</scope>
3535
</dependency>

‎oci-objectstorage-get-object-python/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ ALL {resource.type = 'fnfunc', resource.compartment.id = 'ocid1.compartment.oc1.
5151

5252
## Create or Update IAM Policies
5353

54-
Create a new policy that allows the dynamic group to read `object-family` in
54+
Create a new policy that allows the dynamic group to `read objects` in
5555
the functions related compartment.
5656

5757
![user input icon](./images/userinput.png)
5858

5959
Your policy should look something like this:
6060
```
61-
Allow dynamic-group <dynamic-group name> to read object-family in compartment <compartment-name>
61+
Allow dynamic-group <dynamic-group name> to read objects in compartment <compartment-name>
6262
```
6363
e.g.
6464
```
65-
Allow dynamic-group demo-func-dyn-group to read object-family in compartment demo-func-compartment
65+
Allow dynamic-group demo-func-dyn-group to read objects in compartment demo-func-compartment
6666
```
6767

6868
For more information on how to create policies, go [here](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/policysyntax.htm).

‎oci-objectstorage-list-objects-java/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ ALL {resource.type = 'fnfunc', resource.compartment.id = 'ocid1.compartment.oc1.
5050

5151

5252
## Create or Update IAM Policies
53-
Create a new policy that allows the dynamic group to inspect `object-family` in
53+
Create a new policy that allows the dynamic group to `inspect objects` in
5454
the functions related compartment.
5555

5656
![user input icon](../images/userinput.png)
5757

5858
Your policy should look something like this:
5959
```
60-
Allow dynamic-group <dynamic-group-name> to inspect object-family in compartment <your-compartment-name>
60+
Allow dynamic-group <dynamic-group-name> to inspect objects in compartment <your-compartment-name>
6161
```
6262
e.g.
6363
```
64-
Allow dynamic-group demo-func-dyn-group to inspect object-family in compartment demo-func-compartment
64+
Allow dynamic-group demo-func-dyn-group to inspect objects in compartment demo-func-compartment
6565
```
6666
For more information on how to create policies, go [here](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/policysyntax.htm).
6767

@@ -104,7 +104,7 @@ fn config app <app-name> NAMESPACE <object-storage-namespace>
104104
```
105105
e.g.
106106
```
107-
fn config app myapp NAMESPACE mytenancy
107+
fn config app myapp NAMESPACE myobjnamespace
108108
```
109109

110110
Note that the config value can also be set at the function level.

‎oci-objectstorage-list-objects-java/func-jdk11.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ schema_version: 20180708
22
name: oci-objectstorage-list-objects-java
33
version: 0.0.1
44
runtime: java
5-
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.105
6-
run_image: fnproject/fn-java-fdk:jre11-1.0.105
5+
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.108
6+
run_image: fnproject/fn-java-fdk:jre11-1.0.108
77
cmd: com.example.fn.ObjectStorageListObjects::handleRequest
88
timeout: 120

‎oci-objectstorage-list-objects-java/func.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ schema_version: 20180708
22
name: oci-objectstorage-list-objects-java
33
version: 0.0.5
44
runtime: java
5-
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.105
6-
run_image: fnproject/fn-java-fdk:jre11-1.0.105
5+
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.108
6+
run_image: fnproject/fn-java-fdk:jre11-1.0.108
77
cmd: com.example.fn.ObjectStorageListObjects::handleRequest
88
timeout: 120

‎oci-objectstorage-list-objects-java/pom-jdk11.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<properties>
77
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8-
<fdk.version>1.0.105</fdk.version>
8+
<fdk.version>1.0.108</fdk.version>
99
</properties>
1010
<groupId>com.example.fn</groupId>
1111
<artifactId>oci-objectstorage-list-objects</artifactId>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.oracle.oci.sdk</groupId>
3131
<artifactId>oci-java-sdk-bom</artifactId>
32-
<version>1.13.2</version>
32+
<version>1.17.0</version>
3333
<type>pom</type>
3434
<scope>import</scope>
3535
</dependency>

‎oci-objectstorage-list-objects-java/pom-jdk8.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.oracle.oci.sdk</groupId>
3131
<artifactId>oci-java-sdk-bom</artifactId>
32-
<version>1.13.2</version>
32+
<version>1.17.0</version>
3333
<type>pom</type>
3434
<scope>import</scope>
3535
</dependency>

‎oci-objectstorage-list-objects-java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<properties>
77
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8-
<fdk.version>1.0.105</fdk.version>
8+
<fdk.version>1.0.108</fdk.version>
99
</properties>
1010
<groupId>com.example.fn</groupId>
1111
<artifactId>oci-objectstorage-list-objects</artifactId>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.oracle.oci.sdk</groupId>
3131
<artifactId>oci-java-sdk-bom</artifactId>
32-
<version>1.13.2</version>
32+
<version>1.17.0</version>
3333
<type>pom</type>
3434
<scope>import</scope>
3535
</dependency>

‎oci-objectstorage-list-objects-python/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ ALL {resource.type = 'fnfunc', resource.compartment.id = 'ocid1.compartment.oc1.
5151

5252
## Create or Update IAM Policies
5353

54-
Create a new policy that allows the dynamic group to inspect `object-family` in
54+
Create a new policy that allows the dynamic group to `inspect objects` in
5555
the functions related compartment.
5656

5757
![user input icon](../images/userinput.png)
5858

5959
Your policy should look something like this:
6060
```
61-
Allow dynamic-group <dynamic-group-name> to inspect object-family in compartment <compartment-name>
61+
Allow dynamic-group <dynamic-group-name> to inspect objects in compartment <compartment-name>
6262
```
6363
e.g.
6464
```
65-
Allow dynamic-group demo-func-dyn-group to inspect object-family in compartment demo-func-compartment
65+
Allow dynamic-group demo-func-dyn-group to inspect objects in compartment demo-func-compartment
6666
```
6767
For more information on how to create policies, go [here](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/policysyntax.htm).
6868

‎oci-objectstorage-put-object-java/README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ ALL {resource.type = 'fnfunc', resource.compartment.id = 'ocid1.compartment.oc1.
5050

5151

5252
## Create or Update IAM Policies
53-
Create a new policy that allows the dynamic group to manage `object-family` in
53+
Create a new policy that allows the dynamic group to `manage objects` in
5454
the functions related compartment.
5555

5656
![user input icon](../images/userinput.png)
5757

5858
Your policy should look something like this:
5959
```
60-
Allow dynamic-group <dynamic-group-name> to manage object-family in compartment <compartment-name>
60+
Allow dynamic-group <dynamic-group-name> to manage objects in compartment <compartment-name>
6161
```
6262
e.g.
6363
```
64-
Allow dynamic-group demo-func-dyn-group to manage object-family in compartment demo-func-compartment
64+
Allow dynamic-group demo-func-dyn-group to manage objects in compartment demo-func-compartment
6565
```
6666
For more information on how to create policies, go [here](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/policysyntax.htm).
6767

@@ -105,11 +105,16 @@ fn config app <app-name> NAMESPACE <object-storage-namespace>
105105
```
106106
e.g.
107107
```
108-
fn config app myapp NAMESPACE mytenancy
108+
fn config app myapp NAMESPACE myobjnamespace
109109
```
110110

111111
Note that the config value can also be set at the function level.
112112

113+
## Create a bucket called "test"
114+
115+
![user input icon](../images/userinput.png)
116+
117+
From the OCI Console > Core Infrastructure > Object Storage > Create Bucket with bucket name = "test"
113118

114119
## Test
115120

@@ -121,6 +126,6 @@ echo -n '{"name": "<object-name>", "bucketName":"<bucket-name>", "content": "<te
121126
```
122127
e.g.
123128
```
124-
echo -n '{"name": "file1.txt", "bucketName":"test", "content": "This file was created in OCI object storage bucket using Oracle Functions"}' | fn invoke myapp oci-objectstorage-put-object-java
129+
echo -n '{"name": "file1.txt", "bucketName":"mybucket", "content": "This file was created in OCI object storage bucket using Oracle Functions"}' | fn invoke myapp oci-objectstorage-put-object-java
125130
```
126131
You should see a success message appear in your terminal.

‎oci-objectstorage-put-object-java/func.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ schema_version: 20180708
22
name: oci-objectstorage-put-object-java
33
version: 0.0.1
44
runtime: java
5-
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.105
6-
run_image: fnproject/fn-java-fdk:jre11-1.0.105
5+
build_image: fnproject/fn-java-fdk-build:jdk11-1.0.108
6+
run_image: fnproject/fn-java-fdk:jre11-1.0.108
77
cmd: com.example.fn.ObjectStoragePutObject::handle
88
timeout: 120

‎oci-objectstorage-put-object-java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<properties>
77
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8-
<fdk.version>1.0.105</fdk.version>
8+
<fdk.version>1.0.108</fdk.version>
99
</properties>
1010
<groupId>com.example.fn</groupId>
1111
<artifactId>oci-objectstorage-put-object</artifactId>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.oracle.oci.sdk</groupId>
3131
<artifactId>oci-java-sdk-bom</artifactId>
32-
<version>1.13.2</version>
32+
<version>1.17.0</version>
3333
<type>pom</type>
3434
<scope>import</scope>
3535
</dependency>

‎oci-objectstorage-put-object-python/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ ALL {resource.type = 'fnfunc', resource.compartment.id = 'ocid1.compartment.oc1.
5151

5252
## Create or Update IAM Policies
5353

54-
Create a new policy that allows the dynamic group to manage `object-family` in the functions related compartment.
54+
Create a new policy that allows the dynamic group to `manage objects` in the functions related compartment.
5555

5656
![user input icon](../images/userinput.png)
5757

5858
Your policy should look something like this:
5959
```
60-
Allow dynamic-group <dynamic-group-name> to manage object-family in compartment <compartment-name>
60+
Allow dynamic-group <dynamic-group-name> to manage objects in compartment <compartment-name>
6161
```
6262
e.g.
6363
```
64-
Allow dynamic-group demo-func-dyn-group to manage object-family in compartment demo-func-compartment
64+
Allow dynamic-group demo-func-dyn-group to manage objects in compartment demo-func-compartment
6565
```
6666
For more information on how to create policies, go [here](https://docs.cloud.oracle.com/iaas/Content/Identity/Concepts/policysyntax.htm).
6767

0 commit comments

Comments
 (0)