Merge pull request #47 from fnproject/feature/image_signing

Upgrade OCI SDK to v48.0.0 and expose OCI ConfigurationProvider

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/go-openapi/validate v0.19.12
 	github.com/golang/mock v1.4.4
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/oracle/oci-go-sdk/v28 v28.0.0
+	github.com/oracle/oci-go-sdk/v48 v48.0.0
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b

go.sum

@@ -159,8 +159,8 @@ github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/oracle/oci-go-sdk/v28 v28.0.0 h1:19QPbl+gCbgU3hFGwOS4hRNpM3A+86Xf9mPLdu/wUlk=
-github.com/oracle/oci-go-sdk/v28 v28.0.0/go.mod h1:wpcs8ZqLlnn+SisD7SV959mncC58IZOMKAEM7yUlFPQ=
+github.com/oracle/oci-go-sdk/v48 v48.0.0 h1:ux/bkBFIHOPWhcCxx/c67jTIr/TDGJGRKn5rW6zqy1s=
+github.com/oracle/oci-go-sdk/v48 v48.0.0/go.mod h1:eCa0yXKSofRr/J5fv8pqnxX72yTG2FkbBkL5vC2RXuQ=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=

provider/oracle/cloudshell_provider.go

@@ -2,14 +2,14 @@ package oracle
 
 import (
 	"fmt"
-	"github.com/oracle/oci-go-sdk/v28/functions"
+	"github.com/oracle/oci-go-sdk/v48/functions"
 	"io/ioutil"
 	"net/http"
 	"os"
 
 	"github.com/fnproject/fn_go/provider"
-	oci "github.com/oracle/oci-go-sdk/v28/common"
-	"github.com/oracle/oci-go-sdk/v28/common/auth"
+	oci "github.com/oracle/oci-go-sdk/v48/common"
+	"github.com/oracle/oci-go-sdk/v48/common/auth"
 )
 
 const (
@@ -122,12 +122,13 @@ func NewCSProvider(configSource provider.ConfigSource, passphraseSource provider
 	ociClient.Host = apiUrl.String()
 
 	return &OracleProvider{
-		FnApiUrl:      apiUrl,
-		Signer:        signer,
-		Interceptor:   interceptor,
-		DisableCerts:  disableCerts,
-		CompartmentID: compartmentID,
-		ociClient:     ociClient,
+		FnApiUrl:              apiUrl,
+		Signer:                signer,
+		Interceptor:           interceptor,
+		DisableCerts:          disableCerts,
+		CompartmentID:         compartmentID,
+		ConfigurationProvider: configProvider,
+		ociClient:             ociClient,
 	}, nil
 }
 

provider/oracle/ip_provider.go

@@ -2,13 +2,13 @@ package oracle
 
 import (
 	"fmt"
-	"github.com/oracle/oci-go-sdk/v28/functions"
+	"github.com/oracle/oci-go-sdk/v48/functions"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 
-	"github.com/oracle/oci-go-sdk/v28/common"
-	"github.com/oracle/oci-go-sdk/v28/common/auth"
+	"github.com/oracle/oci-go-sdk/v48/common"
+	"github.com/oracle/oci-go-sdk/v48/common/auth"
 
 	"github.com/fnproject/fn_go/provider"
 )
@@ -68,11 +68,12 @@ func NewIPProvider(configSource provider.ConfigSource, passphraseSource provider
 	}
 
 	return &OracleProvider{
-		FnApiUrl:      apiUrl,
-		Signer:        common.DefaultRequestSigner(configProvider),
-		Interceptor:   nil,
-		DisableCerts:  disableCerts,
-		CompartmentID: compartmentID,
-		ociClient:     ociClient,
+		FnApiUrl:              apiUrl,
+		Signer:                common.DefaultRequestSigner(configProvider),
+		Interceptor:           nil,
+		DisableCerts:          disableCerts,
+		CompartmentID:         compartmentID,
+		ConfigurationProvider: configProvider,
+		ociClient:             ociClient,
 	}, nil
 }

provider/oracle/oracle_common.go

@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"fmt"
 	"github.com/fnproject/fn_go/provider/oracle/shim"
-	"github.com/oracle/oci-go-sdk/v28/functions"
+	"github.com/oracle/oci-go-sdk/v48/functions"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -16,7 +16,7 @@ import (
 	"github.com/fnproject/fn_go/provider"
 	openapi "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
-	"github.com/oracle/oci-go-sdk/v28/common"
+	"github.com/oracle/oci-go-sdk/v48/common"
 )
 
 const (
@@ -72,6 +72,9 @@ type OracleProvider struct {
 	// CompartmentID is the ocid of the functions compartment ID for a given function
 	CompartmentID string
 
+	// ConfigurationProvider is the OCI configuration provider for signing requests
+	ConfigurationProvider common.ConfigurationProvider
+
 	ociClient functions.FunctionsManagementClient
 }
 

provider/oracle/shim/apps.go

@@ -7,7 +7,7 @@ import (
 	"github.com/fnproject/fn_go/provider/oracle/shim/client"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/oracle/oci-go-sdk/v28/functions"
+	"github.com/oracle/oci-go-sdk/v48/functions"
 )
 
 const (

provider/oracle/shim/client/client.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	"context"
-	"github.com/oracle/oci-go-sdk/v28/functions"
+	"github.com/oracle/oci-go-sdk/v48/functions"
 )
 
 // Interface extracted from Go SDK FunctionsManagementClient for mockability

provider/oracle/shim/client/client_mock.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 	"github.com/golang/mock/gomock"
-	"github.com/oracle/oci-go-sdk/v28/common"
-	"github.com/oracle/oci-go-sdk/v28/functions"
+	"github.com/oracle/oci-go-sdk/v48/common"
+	"github.com/oracle/oci-go-sdk/v48/functions"
 	"time"
 )
 

provider/oracle/shim/fns.go

@@ -7,7 +7,7 @@ import (
 	"github.com/fnproject/fn_go/provider/oracle/shim/client"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
-	"github.com/oracle/oci-go-sdk/v28/functions"
+	"github.com/oracle/oci-go-sdk/v48/functions"
 )
 
 const (

provider/oracle/user_provider.go

@@ -5,7 +5,7 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"github.com/oracle/oci-go-sdk/v28/functions"
+	"github.com/oracle/oci-go-sdk/v48/functions"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -14,7 +14,7 @@ import (
 
 	"github.com/fnproject/fn_go/provider"
 	homedir "github.com/mitchellh/go-homedir"
-	oci "github.com/oracle/oci-go-sdk/v28/common"
+	oci "github.com/oracle/oci-go-sdk/v48/common"
 )
 
 const (
@@ -67,12 +67,13 @@ func NewFromConfig(configSource provider.ConfigSource, passphraseSource provider
 	}
 
 	return &OracleProvider{
-		FnApiUrl:      apiUrl,
-		Signer:        oci.DefaultRequestSigner(configProvider),
-		Interceptor:   nil,
-		DisableCerts:  disableCerts,
-		CompartmentID: compartmentID,
-		ociClient:     ociClient,
+		FnApiUrl:              apiUrl,
+		Signer:                oci.DefaultRequestSigner(configProvider),
+		Interceptor:           nil,
+		DisableCerts:          disableCerts,
+		CompartmentID:         compartmentID,
+		ConfigurationProvider: configProvider,
+		ociClient:             ociClient,
 	}, nil
 }