Switch symptomDate to testDate for bulk uploader (#1193)

* Switch symptomDate to testDate

* allow symptom 3rd col

* fix dep ctx

* add text

Author: whaught

cmd/adminapi/main.go

@@ -78,7 +78,7 @@ func realMain(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
 	}
-	if err := oe.StartExporter(); err != nil {
+	if err := oe.StartExporter(ctx); err != nil {
 		return fmt.Errorf("error initializing observability exporter: %w", err)
 	}
 	defer oe.Close()

cmd/apiserver/main.go

@@ -81,7 +81,7 @@ func realMain(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
 	}
-	if err := oe.StartExporter(); err != nil {
+	if err := oe.StartExporter(ctx); err != nil {
 		return fmt.Errorf("error initializing observability exporter: %w", err)
 	}
 	defer oe.Close()

cmd/app-sync/main.go

@@ -69,7 +69,7 @@ func realMain(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
 	}
-	if err := oe.StartExporter(); err != nil {
+	if err := oe.StartExporter(ctx); err != nil {
 		return fmt.Errorf("error initializing observability exporter: %w", err)
 	}
 	defer oe.Close()

cmd/cleanup/main.go

@@ -70,7 +70,7 @@ func realMain(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
 	}
-	if err := oe.StartExporter(); err != nil {
+	if err := oe.StartExporter(ctx); err != nil {
 		return fmt.Errorf("error initializing observability exporter: %w", err)
 	}
 	defer oe.Close()

cmd/e2e-runner/main.go

@@ -91,7 +91,7 @@ func realMain(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
 	}
-	if err := oe.StartExporter(); err != nil {
+	if err := oe.StartExporter(ctx); err != nil {
 		return fmt.Errorf("error initializing observability exporter: %w", err)
 	}
 	defer oe.Close()

cmd/enx-redirect/main.go

@@ -73,7 +73,7 @@ func realMain(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
 	}
-	if err := oe.StartExporter(); err != nil {
+	if err := oe.StartExporter(ctx); err != nil {
 		return fmt.Errorf("error initializing observability exporter: %w", err)
 	}
 	defer oe.Close()

cmd/modeler/main.go

@@ -73,7 +73,7 @@ func realMain(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
 	}
-	if err := oe.StartExporter(); err != nil {
+	if err := oe.StartExporter(ctx); err != nil {
 		return fmt.Errorf("error initializing observability exporter: %w", err)
 	}
 	defer oe.Close()

cmd/server/assets/codes/bulk-issue.html

@@ -39,7 +39,7 @@
               <label class="custom-file-label" for="csv" id="file-label">Select a CSV file...</label>
             </div>
             <small class="form-text text-muted">
-              The CSV file must be of the format <code>phone,date</code>. Each
+              The CSV file must be of the format <code>phone,testDate,[optional]symptomDate</code>. Each
               entry must appear on its own line, and phone numbers must be in
               <a href="https://www.twilio.com/docs/glossary/what-e164" target="_blank">E.164</a>
               format and dates in <a href="https://www.iso.org/iso-8601-date-and-time-format.html" target="_blank">ISO 8601</a>.
@@ -218,7 +218,7 @@
             if (batch.length >= batchSize || i == rows.length - 1 && batch.length > 0) {
               $tableBody.empty();
               for(let r = 0; r < batch.length; r++) {
-                let row = "<tr><td>" + batch[r]["phone"] + "</td><td>" + batch[r]["symptomDate"] + "</td></tr>";
+                let row = "<tr><td>" + batch[r]["phone"] + "</td><td>" + batch[r]["testDate"] + "</td></tr>";
                 $tableBody.append(row);
               }
 
@@ -265,7 +265,8 @@
 
         // Escape csv row contents
         request["phone"] = $("<div>").text(cols[0].trim()).html();
-        request["symptomDate"] = (cols.length > 1) ? $("<div>").text(cols[1].trim()).html() : "";
+        request["testDate"] = (cols.length > 1) ? $("<div>").text(cols[1].trim()).html() : "";
+        request["symptomDate"] = (cols.length > 2) ? $("<div>").text(cols[2].trim()).html() : "";
         if (request["phone"] == "") {
           return "";
         }

cmd/server/main.go

@@ -71,7 +71,7 @@ func realMain(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
 	}
-	if err := oe.StartExporter(); err != nil {
+	if err := oe.StartExporter(ctx); err != nil {
 		return fmt.Errorf("error initializing observability exporter: %w", err)
 	}
 	defer oe.Close()

docs/api.md

@@ -62,7 +62,7 @@ Exchange a verification code for a long term verification token.
   * `["confirmed", "likely"]`
   * `["confirmed", "likely", "negative"]`
   * It is not possible to get just `likely` or just `negative` - if a client
-        passes `likely` they are indiciating they can process both `confirmed` and `likely`.
+        passes `likely` they are indicating they can process both `confirmed` and `likely`.
 * `padding` is a _recommended_ field that obfuscates the size of the request
   body to a network observer. The client should generate and insert a random
   number of base64-encoded bytes into this field. The server does not process
@@ -98,7 +98,7 @@ Possible error code responses. New error codes may be added in future releases.
 | `code_invalid`          | 400         | No    | Code invalid or used, user may need to obtain a new code. |
 | `code_expired`          | 400         | No    | Code has expired, user may need to obtain a new code. |
 | `code_not_found`        | 400         | No    | The server has no record of that code. |
-| `invalid_test_type`     | 400         | No    | The client sent an accept of an unrecgonized test type |
+| `invalid_test_type`     | 400         | No    | The client sent an accept of an unrecognized test type |
 | `missing_date`          | 400         | No    | The realm requires either a test or symptom date, but none was provided. |
 | `uuid_already_exists`   | 409         | No    | The UUID has already been used for an issued code |
 | `maintenance_mode   `   | 429         | Yes   | The server is temporarily down for maintenance. Wait and retry later. |