Merge pull request #49 from fnproject/image-comp-cloudshell

Add non-root compartment image support to cloud shell and ip
fnproject · Apr 5, 2022 · 5c2cbfd · 5c2cbfd
2 parents d8b70e0 + 03cf416
commit 5c2cbfd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/provider/oracle/cloudshell_provider.go b/provider/oracle/cloudshell_provider.go
@@ -2,11 +2,12 @@ package oracle
 
 import (
 	"fmt"
-	"github.com/oracle/oci-go-sdk/v48/functions"
 	"io/ioutil"
 	"net/http"
 	"os"
 
+	"github.com/oracle/oci-go-sdk/v48/functions"
+
 	"github.com/fnproject/fn_go/provider"
 	oci "github.com/oracle/oci-go-sdk/v48/common"
 	"github.com/oracle/oci-go-sdk/v48/common/auth"
@@ -127,6 +128,7 @@ func NewCSProvider(configSource provider.ConfigSource, passphraseSource provider
 		Interceptor:           interceptor,
 		DisableCerts:          disableCerts,
 		CompartmentID:         compartmentID,
+		ImageCompartmentID:    configSource.GetString(CfgImageCompartmentID),
 		ConfigurationProvider: configProvider,
 		ociClient:             ociClient,
 	}, nil

diff --git a/provider/oracle/ip_provider.go b/provider/oracle/ip_provider.go
@@ -2,11 +2,12 @@ package oracle
 
 import (
 	"fmt"
-	"github.com/oracle/oci-go-sdk/v48/functions"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 
+	"github.com/oracle/oci-go-sdk/v48/functions"
+
 	"github.com/oracle/oci-go-sdk/v48/common"
 	"github.com/oracle/oci-go-sdk/v48/common/auth"
 
@@ -73,6 +74,7 @@ func NewIPProvider(configSource provider.ConfigSource, passphraseSource provider
 		Interceptor:           nil,
 		DisableCerts:          disableCerts,
 		CompartmentID:         compartmentID,
+		ImageCompartmentID:    configSource.GetString(CfgImageCompartmentID),
 		ConfigurationProvider: configProvider,
 		ociClient:             ociClient,
 	}, nil