fix: install Git in Ubuntu image

Also remove retry attempts as I'm not 100% confident they'll work in every situation.
snyk · Nov 9, 2022 · c90a22f · c90a22f
1 parent 29ebf2a
commit c90a22f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile
@@ -6,7 +6,7 @@ FROM ubuntu:20.04
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node \
-  && apt update && apt upgrade -y && apt install gpg curl xz-utils -y
+  && apt update && apt upgrade -y && apt install git gpg curl xz-utils -y
 
 ENV NODE_VERSION 16.17.0
 

diff --git a/lib/stream-posts.js b/lib/stream-posts.js
@@ -13,16 +13,14 @@ class ResponseStreamer {
 
   #buffer;
 
-  #requestCount = 0;
-
   constructor(logContext, config, brokerToken, streamingID) {
     this.#logContext = logContext;
     this.#config = config;
     this.#brokerToken = brokerToken;
     this.#streamingID = streamingID;
   }
 
-  initStream(ioData, retryCallback) {
+  initStream(ioData) {
     this.#buffer = new stream.PassThrough({ highWaterMark: 1048576 });
     const postRequest = request({
       url: `${this.#config.brokerServerUrl}/response-data/${
@@ -41,22 +39,6 @@ class ResponseStreamer {
       postRequest
         .on('error', (e) => {
           logger.error({ error: e }, 'received error sending data via POST');
-          if (
-            e.message.includes('connect ETIMEDOUT') &&
-            retryCallback &&
-            this.#requestCount < MAX_ATTEMPTS
-          ) {
-            logger.error(
-              {
-                ...this.#logContext,
-                requestCount: this.#requestCount,
-                MAX_ATTEMPTS,
-              },
-              'connect timed out - making another POST request to the server',
-            );
-            this.#requestCount++;
-            retryCallback();
-          }
         })
         .on('response', (r) => {
           if (r.statusCode !== 200) {
@@ -92,9 +74,7 @@ class ResponseStreamer {
       { ...this.#logContext, statusAndHeaders, body },
       "posting internal response back to Broker Server as it's expecting streaming response",
     );
-    this.initStream(JSON.stringify(statusAndHeaders), () =>
-      this.sendData(statusAndHeaders, body),
-    );
+    this.initStream(JSON.stringify(statusAndHeaders));
     this.#buffer.write(typeof body !== 'string' ? JSON.stringify(body) : body);
     this.#buffer.end();
   }
@@ -118,7 +98,6 @@ class ResponseStreamer {
                   'Content-Type': 'application/json',
                 },
               }),
-              doSend,
             );
             this.#buffer.write(body);
             this.#buffer.end();
@@ -139,7 +118,7 @@ class ResponseStreamer {
           status,
           headers: response.headers,
         });
-        this.initStream(ioData, () => this.pipeStream(rqst));
+        this.initStream(ioData);
       })
       .on('data', (chunk) => {
         logger.trace(`writing data of length ${chunk.length} to buffer`);