Add new argument retry_timeout to export command for configuring retry duration

Author: parrneet

main.go

@@ -27,6 +27,7 @@ func main() {
 	var generateStateFile = flag.Bool("generate_state", false, "[export][experimental] Set this to import the discovered resources into a state file along with the Terraform configuration")
 	var help = flag.Bool("help", false, "Prints usage options")
 	var tfVersion = flag.String("tf_version", "0.12", "The version of terraform syntax to generate for configurations. The state file will be written in v0.12 only. The allowed values are :\n * 0.11\n * 0.12")
+	var retryTimeout = flag.String("retry_timeout", "15s", "[export] The time duration for which API calls will wait and retry operation in case of API errors. By default, the retry timeout duration is 15s")
 
 	flag.Parse()
 	provider.PrintVersion()
@@ -62,6 +63,7 @@ func main() {
 				OutputDir:       outputPath,
 				GenerateState:   *generateStateFile,
 				TFVersion:       &terraformVersion,
+				RetryTimeout:    retryTimeout,
 			}
 
 			if services != nil && *services != "" {

oci/export_compartment.go

@@ -119,6 +119,7 @@ type ExportCommandArgs struct {
 	OutputDir       *string
 	GenerateState   bool
 	TFVersion       *TfHclVersion
+	RetryTimeout    *string
 }
 
 func RunExportCommand(args *ExportCommandArgs) (error, Status) {
@@ -163,6 +164,19 @@ func RunExportCommand(args *ExportCommandArgs) (error, Status) {
 
 	ctx := createResourceDiscoveryContext(clients.(*OracleClients), args, tenancyOcid)
 
+	/*
+		Setting retry timeout to a lower value for resource discovery
+		This is done to handle the 404 and 500 errors in case
+		any resource is unavailable in a region or in case the service is down
+		The time out value is configurable from export command
+	*/
+	if args.RetryTimeout != nil && *args.RetryTimeout != "" {
+		longRetryTime = *getTimeoutDuration(*args.RetryTimeout)
+		shortRetryTime = longRetryTime
+	}
+
+	log.Printf("[INFO] resource discovery retry timeout duration set to %v", shortRetryTime)
+
 	if err := runExportCommand(ctx); err != nil {
 		return err, StatusFail
 	}

oci/export_resource_helpers.go

@@ -90,8 +90,8 @@ type resourceDiscoveryContext struct {
 // Resource discovery Exit status
 type Status int
 
-// Exit statuses
 const (
+	// Exit statuses
 	StatusSuccess Status = iota
 	StatusFail
 	StatusPartialSuccess