Disable check for org and location id, bump timeout (#3712)

Co-authored-by: Maxim Pertsov <[email protected]>
viamrobotics · Mar 20, 2024 · 6aa0e6a · 6aa0e6a
1 parent e6f7db2
commit 6aa0e6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/config/config.go b/config/config.go
@@ -604,12 +604,6 @@ func (config *Cloud) Validate(path string, fromCloud bool) error {
 		if config.LocalFQDN == "" {
 			return resource.NewConfigValidationFieldRequiredError(path, "local_fqdn")
 		}
-		if config.PrimaryOrgID == "" {
-			return resource.NewConfigValidationFieldRequiredError(path, "primary_org_id")
-		}
-		if config.LocationID == "" {
-			return resource.NewConfigValidationFieldRequiredError(path, "location_id")
-		}
 	} else if config.Secret == "" {
 		return resource.NewConfigValidationFieldRequiredError(path, "secret")
 	}

diff --git a/config/config_test.go b/config/config_test.go
@@ -220,15 +220,6 @@ func TestConfigEnsure(t *testing.T) {
 	test.That(t, err, test.ShouldNotBeNil)
 	test.That(t, resource.GetFieldFromFieldRequiredError(err), test.ShouldEqual, "local_fqdn")
 	invalidCloud.Cloud.LocalFQDN = "yeeself"
-	err = invalidCloud.Ensure(true, logger)
-	test.That(t, err, test.ShouldNotBeNil)
-	test.That(t, resource.GetFieldFromFieldRequiredError(err), test.ShouldEqual, "primary_org_id")
-	invalidCloud.Cloud.PrimaryOrgID = "the-primary-org"
-	err = invalidCloud.Ensure(true, logger)
-	test.That(t, err, test.ShouldNotBeNil)
-	test.That(t, resource.GetFieldFromFieldRequiredError(err), test.ShouldEqual, "location_id")
-	invalidCloud.Cloud.LocationID = "the-location"
-	test.That(t, invalidCloud.Ensure(true, logger), test.ShouldBeNil)
 
 	invalidRemotes := config.Config{
 		DisablePartialStart: true,
@@ -485,13 +476,6 @@ func TestConfigEnsurePartialStart(t *testing.T) {
 	test.That(t, err, test.ShouldNotBeNil)
 	test.That(t, resource.GetFieldFromFieldRequiredError(err), test.ShouldEqual, "local_fqdn")
 	invalidCloud.Cloud.LocalFQDN = "yeeself"
-	err = invalidCloud.Ensure(true, logger)
-	test.That(t, resource.GetFieldFromFieldRequiredError(err), test.ShouldEqual, "primary_org_id")
-	invalidCloud.Cloud.PrimaryOrgID = "the-primary-org"
-	err = invalidCloud.Ensure(true, logger)
-	test.That(t, err, test.ShouldNotBeNil)
-	test.That(t, resource.GetFieldFromFieldRequiredError(err), test.ShouldEqual, "location_id")
-	invalidCloud.Cloud.LocationID = "the-location"
 
 	test.That(t, invalidCloud.Ensure(true, logger), test.ShouldBeNil)
 

diff --git a/config/reader.go b/config/reader.go
@@ -32,6 +32,11 @@ var (
 	DateCompiled = ""
 )
 
+const (
+	initialReadTimeout = 1 * time.Second
+	readTimeout        = 5 * time.Second
+)
+
 func getAgentInfo() (*apppb.AgentInfo, error) {
 	hostname, err := os.Hostname()
 	if err != nil {
@@ -252,9 +257,9 @@ func readFromCloud(
 		)
 		// use shouldReadFromCache determine whether this is part of initial read or not
 		if shouldReadFromCache {
-			ctxWithTimeout, cancel = context.WithTimeout(ctx, 500*time.Millisecond)
+			ctxWithTimeout, cancel = context.WithTimeout(ctx, initialReadTimeout)
 		} else {
-			ctxWithTimeout, cancel = context.WithTimeout(ctx, 5*time.Second)
+			ctxWithTimeout, cancel = context.WithTimeout(ctx, readTimeout)
 		}
 		// Use the SignalingInsecure from the Cloud config returned from the app not the initial config.
 		certData, err := readCertificateDataFromCloudGRPC(ctxWithTimeout, cfg.Cloud.SignalingInsecure, cloudCfg, logger)
@@ -609,9 +614,9 @@ func getFromCloudOrCache(ctx context.Context, cloudCfg *Cloud, shouldReadFromCac
 	)
 	// use shouldReadFromCache determine whether this is part of initial read or not
 	if shouldReadFromCache {
-		ctxWithTimeout, cancel = context.WithTimeout(ctx, 500*time.Millisecond)
+		ctxWithTimeout, cancel = context.WithTimeout(ctx, initialReadTimeout)
 	} else {
-		ctxWithTimeout, cancel = context.WithTimeout(ctx, 5*time.Second)
+		ctxWithTimeout, cancel = context.WithTimeout(ctx, readTimeout)
 	}
 	defer cancel()