Support for Global Active Tables (#28)

* Added AddReplicaRequest, DropReplicaRequest, ReplicaStatsRequest
* Added Replica information to TableResult
* Added signing of body hash for specific requests.

Also cleaned up a bunch of warnings, including ioutil being
deprecated as of go 1.16.

Author: connelly38

CHANGELOG.md

@@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Added
 - Latest Oracle Cloud Infrastructure regions and region codes: TYO, ABH, DAC, DOH, IZQ
+- Cloud only: added support for Global Active Tables. This includes new requests and structs:
+  - AddReplicaRequest
+  - DropReplicaRequest
+  - ReplicaStatsRequest/Result
+  - ReplicaStats
+  - Replica
+  as well as additional replica-related information in TableResult
 
 ### Changed
 - Changed copyrights to 2024

README.md

@@ -11,8 +11,8 @@ and to [the Oracle NoSQL Cloud Simulator](https://www.oracle.com/downloads/cloud
 This project is open source and maintained by Oracle Corp.
 
 ## Prerequisites
-- Go 1.12 or later
-  - Download a [Go](https://golang.org/dl/) 1.12+ binary release suitable for your system.
+- Go 1.16 or later
+  - Download a [Go](https://golang.org/dl/) 1.16+ binary release suitable for your system.
   - Install on your system following the [installation instructions](https://golang.org/doc/install).
   - Go for Oracle Linux 7 can be installed via `yum`: [Go Packages for Oracle Linux](http://yum.oracle.com/oracle-linux-golang.html).
   - Add the directory that contains the `go` executable into your system PATH, for example:
@@ -37,15 +37,6 @@ recommended to use the Go modules to manage dependencies for your application.
 Run `go env GOPROXY` to check if the `GOPROXY` is set correctly for your environment,
 if not, run the commands:
 
-* If using `go1.12`
-
-```sh
-export GO111MODULE="on"
-export GOPROXY="https://proxy.golang.org"
-```
-
-* If using `go1.13+`:
-
 ```go
 go env -w GO111MODULE=on
 go env -w GOPROXY="https://proxy.golang.org,direct"

doc/connect.md

@@ -7,8 +7,8 @@ Database Go SDK. There are several supported environments:
 
 ## Prerequisites
 
-Th Go SDK requires:
-* Go 1.12 or later
+The Go SDK requires:
+* Go 1.16 or later
 * For the Oracle NoSQL Cloud Service
   - An Oracle Cloud Infrastructure account
   - A user created in that account, in a group with a policy that grants the desired permissions.
@@ -27,15 +27,6 @@ recommended to use the Go modules to manage dependencies for your application.
 
 Run `go env GOPROXY` to check if the `GOPROXY` is set correctly for your environment, if not, run the commands:
 
-* If using `go1.12`
-
-```sh
-export GO111MODULE="on"
-export GOPROXY="https://proxy.golang.org"
-```
-
-* If using `go1.13+`:
-
 ```go
 go env -w GO111MODULE=on
 go env -w GOPROXY="https://proxy.golang.org,direct"

internal/test/cloudsim_config.json

@@ -1,5 +1,5 @@
 {
- "version": "22.4.10",
+ "version": "24.1.11-SNAPSHOT",
  "tablePrefix": "Go",
  "reCreateTables": true,
  "verbose": true,

internal/test/config.go

@@ -13,7 +13,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 	"time"
 
@@ -61,7 +61,7 @@ func newConfig(configFile string) (*Config, error) {
 		return nil, errors.New("config file not specified")
 	}
 
-	data, err := ioutil.ReadFile(configFile)
+	data, err := os.ReadFile(configFile)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read config file %s: %v", configFile, err)
 	}
@@ -106,8 +106,7 @@ func (cfg *Config) IsOnPremSecureStore() bool {
 // createConfig creates a test configuration object from the JSON file specified
 // on command line of the form:
 //
-//   testConfig=<path to JSON file>
-//
+//	testConfig=<path to JSON file>
 func createConfig() (cfg *Config, err error) {
 	if !flag.Parsed() {
 		flag.Parse()
@@ -173,20 +172,6 @@ func createClient(cfg *Config) (*nosqldb.Client, error) {
 	return client, nil
 }
 
-// getClient returns a NoSQL client used for testing.
-//
-// If there is a test client already created, the client is returned, otherwise
-// it creates a new client with the specified configuration.
-func getClient(cfg *Config) (*nosqldb.Client, error) {
-	if client != nil {
-		return client, nil
-	}
-
-	var err error
-	client, err = createClient(cfg)
-	return client, err
-}
-
 // Interceptor represents an interceptor that used to inject customized
 // procedures to setup NoSQL client, setup and teardown test resources.
 //
@@ -256,10 +241,6 @@ const (
 	// MinReadKB represents the minimum read KB for a query operation
 	MinReadKB = 1
 
-	// The default interval between two tests.
-	// This is used to avoid throttling errors during testing.
-	defaultTestInterval = 500 * time.Millisecond
-
 	// MaxDataSizeLimit represents the limit on data size for a row.
 	// It is 512 KB.
 	MaxDataSizeLimit = 512 * 1024

internal/test/onprem_config.json

@@ -1,16 +1,12 @@
 {
-    "version": "20.2.15",
-    "tablePrefix": "Go",
-    "reCreateTables": true,
-    "dropTablesOnTearDown": true,
-    "clientConfig": {
-        "mode": "onprem",
-        "endpoint": "https://localhost:8091",
-        "username": "driver_user",
-        "password": "RHJpdmVyVXNlcl9fMTIzNDU2",
-        "httpConfig": {
-            "certPath": "/path/to/server_certificate.pem",
-            "serverName": "localhost"
-        }
-    }
-}
+ "version": "24.1.11-SNAPSHOT",
+ "tablePrefix": "Go",
+ "reCreateTables": true,
+ "dropTablesOnTearDown": true,
+ "verbose": true,
+ "serialVersion": 0,
+ "clientConfig": {
+  "endpoint": "http://localhost:8090",
+  "mode": "onprem"
+ }
+}

internal/test/test_util.go

@@ -224,7 +224,7 @@ func valueEqual(v1, v2 interface{}) bool {
 	}
 
 	if v2 == nil {
-		return v1 == nil || v1 == types.JSONNullValueInstance ||
+		return v1 == types.JSONNullValueInstance ||
 			v1 == types.NullValueInstance || v1 == types.EmptyValueInstance
 	}
 
@@ -350,7 +350,7 @@ func VersionsEqual(v1, v2 types.Version) bool {
 		return false
 	}
 	// Compare 0-6
-	if bytes.Equal(arr1[:7], arr2[:7]) == false {
+	if !bytes.Equal(arr1[:7], arr2[:7]) {
 		return false
 	}
 	// Compare 8-end
@@ -454,11 +454,7 @@ func ratValueEqual(rat1, rat2 *big.Rat, fpArithSpec *nosqldb.FPArithSpec) bool {
 
 	// as last resort, compare the string representation.
 	decimalPrec := int(fpArithSpec.Precision)
-	if bf1.Text('G', decimalPrec) == bf2.Text('G', decimalPrec) {
-		return true
-	}
-
-	return false
+	return bf1.Text('G', decimalPrec) == bf2.Text('G', decimalPrec)
 }
 
 func timeValueEqual(t1 time.Time, v2 interface{}) bool {

nosqldb/aggr_iter.go

@@ -482,16 +482,15 @@ func (iter *funcMinMaxIter) displayContent(sb *strings.Builder, f *planFormatter
 // This function returns an error if either of the two values is non-atomic or
 // the values are not comparable. Otherwise, the returned res is:
 //
-//   0 if v1 == v2
-//   1 if v1 > v2
-//   -1 if v1 < v2
+//	0 if v1 == v2
+//	1 if v1 > v2
+//	-1 if v1 < v2
 //
 // Whether the two values are comparable depends on the "forSort" parameter.
 // If true, then values that would otherwise be considered non-comparable are
 // assumed to have the following order:
 //
-//   NUMERICS < TIMESTAMP < STRING < BOOLEAN < EMPTY < JSON_NULL < NULL
-//
+//	NUMERICS < TIMESTAMP < STRING < BOOLEAN < EMPTY < JSON_NULL < NULL
 func compareAtomicValues(rcb *runtimeControlBlock, forSort bool, v1, v2 types.FieldValue) (res int, err error) {
 	if rcb != nil {
 		rcb.trace(4, "compareAtomicValues() : comparing values %v and %v", v1, v2)
@@ -784,7 +783,7 @@ func compareBools(x, y bool) int {
 	switch {
 	case x == y:
 		return 0
-	case x == false:
+	case !x:
 		return -1
 	default:
 		return 1

nosqldb/auth/cloudsim/cloudsim.go

@@ -13,6 +13,7 @@ import (
 	"net/http"
 
 	"github.com/oracle/nosql-go-sdk/nosqldb/auth"
+	"github.com/oracle/nosql-go-sdk/nosqldb/logger"
 )
 
 // AccessTokenProvider implements the nosqldb.AuthorizationProvider interface.
@@ -46,3 +47,8 @@ func (p *AccessTokenProvider) Close() error {
 func (p *AccessTokenProvider) SignHTTPRequest(req *http.Request) error {
 	return nil
 }
+
+// GetLogger returns a logger to use.
+func (p *AccessTokenProvider) GetLogger() *logger.Logger {
+	return nil
+}

nosqldb/auth/iam/configuration.go

@@ -6,7 +6,6 @@ import (
 	"crypto/rsa"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
@@ -198,7 +197,7 @@ func parseConfigFile(data []byte, profile string) (info *configFileInfo, err err
 
 	//Look for profile
 	for i, line := range splitContent {
-		if match := profileRegex.FindStringSubmatch(line); match != nil && len(match) > 1 && match[1] == profile {
+		if match := profileRegex.FindStringSubmatch(line); len(match) > 1 && match[1] == profile {
 			start := i + 1
 			return parseConfigAtLine(start, splitContent)
 		}
@@ -257,7 +256,7 @@ func openConfigFile(configFilePath string) (data []byte, err error) {
 		return
 	}
 
-	data, err = ioutil.ReadFile(expandedPath)
+	data, err = os.ReadFile(expandedPath)
 	if err != nil {
 		err = fmt.Errorf("can not read config file: %s due to: %s", configFilePath, err.Error())
 	}
@@ -272,7 +271,7 @@ func readTokenFromFile(tokenFilePath string) (string, error) {
 		return "", err
 	}
 
-	data, err := ioutil.ReadFile(expandedPath)
+	data, err := os.ReadFile(expandedPath)
 	if err != nil {
 		err = fmt.Errorf("can not read token file: %s due to: %s", tokenFilePath, err.Error())
 		return "", err
@@ -404,7 +403,7 @@ func (p fileConfigurationProvider) PrivateRSAKey() (key *rsa.PrivateKey, err err
 		return
 	}
 
-	pemFileContent, err := ioutil.ReadFile(expandedPath)
+	pemFileContent, err := os.ReadFile(expandedPath)
 	if err != nil {
 		err = fmt.Errorf("can not read PrivateKey %s from configuration file due to: %s", filePath, err.Error())
 		return
@@ -439,7 +438,7 @@ func (p fileConfigurationProvider) Region() (value string, err error) {
 	return canStringBeRegion(value)
 }
 
-var blankRegex = regexp.MustCompile("\\s")
+var blankRegex = regexp.MustCompile(`\s`)
 
 func canStringBeRegion(stringRegion string) (region string, err error) {
 	if blankRegex.MatchString(stringRegion) || stringRegion == "" {