Merge branch 'master' of github.com:porter-dev/porter into nico/rbac-crud-operations

api/server/handlers/infra/forms.go

@@ -91,12 +91,12 @@ tabs:
           value: db.t3.xlarge
         - label: db.t3.2xlarge
           value: db.t3.2xlarge
-        - label: db.r6g.large
-          value: db.r6g.large
-        - label: db.r6g.xlarge
-          value: db.r6g.xlarge
-        - label: db.r6g.2xlarge
-          value: db.r6g.2xlarge
+        - label: db.r5.large
+          value: db.r5.large
+        - label: db.r5.xlarge
+          value: db.r5.xlarge
+        - label: db.r5.2xlarge
+          value: db.r5.2xlarge
   - name: family-versions
     contents:
     - type: select

cli/cmd/connect/dockerhub.go

@@ -22,21 +22,19 @@ func Dockerhub(
 
 	// query for dockerhub name
 
-	repoName, err := utils.PromptPlaintext(fmt.Sprintf(`Provide the Docker Hub image path, in the form of ${org_name}/${repo_name}. For example, porter1/porter.
-Image path: `))
+	repoName, err := utils.PromptPlaintext("Provide the Docker Hub organization name. For example, if your Docker Hub repository is 'myorg/myrepo', enter 'myorg'.\nName: ")
 
 	if err != nil {
 		return 0, err
 	}
 
-	username, err := utils.PromptPlaintext(fmt.Sprintf(`Docker Hub username: `))
+	username, err := utils.PromptPlaintext("Docker Hub username: ")
 
 	if err != nil {
 		return 0, err
 	}
 
-	password, err := utils.PromptPassword(`Provide the Docker Hub personal access token.
-Token:`)
+	password, err := utils.PromptPassword("Provide the Docker Hub personal access token.\nToken: ")
 
 	if err != nil {
 		return 0, err

cli/cmd/docker/agent.go

@@ -401,7 +401,7 @@ func (a *Agent) getPushOptions(image string) (types.ImagePushOptions, error) {
 }
 
 func GetServerURLFromTag(image string) (string, error) {
-	named, err := reference.ParseNamed(image)
+	named, err := reference.ParseNormalizedNamed(image)
 
 	if err != nil {
 		return "", err
@@ -432,6 +432,10 @@ func GetServerURLFromTag(image string) (string, error) {
 		return "", err
 	}
 
+	if domain == "docker.io" {
+		domain = "index.docker.io"
+	}
+
 	return fmt.Sprintf("%s/%s", domain, nonImagePath), nil
 }
 

dashboard/src/main/home/cluster-dashboard/expanded-chart/status/Logs.tsx

@@ -77,15 +77,14 @@ const LogsFC: React.FC<{
     ) {
       return previousLogs?.map((log, i) => {
         return (
-          <Log key={[log.lineNumber, i].join(".")}>
-            <span className="line-number">{log.lineNumber}</span>
-            {log.line.map((ansi, j) => {
+          <Log key={i}>
+            {log.map((ansi, j) => {
               if (ansi.clearLine) {
                 return null;
               }
 
               return (
-                <LogSpan key={[log.lineNumber, i, j].join(".")} ansi={ansi}>
+                <LogSpan key={i + "." + j} ansi={ansi}>
                   {ansi.content.replace(/ /g, "\u00a0")}
                 </LogSpan>
               );
@@ -109,15 +108,14 @@ const LogsFC: React.FC<{
 
     return logs?.map((log, i) => {
       return (
-        <Log key={[log.lineNumber, i].join(".")}>
-          <span className="line-number">{log.lineNumber}</span>
-          {log.line.map((ansi, j) => {
+        <Log key={i}>
+          {log.map((ansi, j) => {
             if (ansi.clearLine) {
               return null;
             }
 
             return (
-              <LogSpan key={[log.lineNumber, i, j].join(".")} ansi={ansi}>
+              <LogSpan key={i + "." + j} ansi={ansi}>
                 {ansi.content.replace(/ /g, "\u00a0")}
               </LogSpan>
             );
@@ -353,14 +351,6 @@ const Message = styled.div`
 
 const Log = styled.div`
   font-family: monospace;
-  & > .line-number {
-    display: inline-block;
-    text-align: right;
-    min-width: 35px;
-    margin-right: 8px;
-    opacity: 0.3;
-    font-family: monospace;
-  }
 `;
 
 const LogSpan = styled.span`

dashboard/src/main/home/cluster-dashboard/expanded-chart/status/useLogs.ts

@@ -5,29 +5,23 @@ import { Context } from "shared/Context";
 import { useWebsockets, NewWebsocketOptions } from "shared/hooks/useWebsockets";
 import { SelectedPodType } from "./types";
 
-const MAX_LOGS = 5000;
-const LOGS_BUFFER_SIZE = 1000;
-
-interface Log {
-  line: Anser.AnserJsonEntry[];
-  lineNumber: number;
-}
+const MAX_LOGS = 250;
 
 export const useLogs = (
   currentPod: SelectedPodType,
   scroll?: (smooth: boolean) => void
 ) => {
-  let logsBufferRef = useRef<Record<string, Log[]>>({});
   const currentPodName = useRef<string>();
 
   const { currentCluster, currentProject } = useContext(Context);
   const [containers, setContainers] = useState<string[]>([]);
   const [currentContainer, setCurrentContainer] = useState<string>("");
   const [logs, setLogs] = useState<{
-    [key: string]: Log[];
+    [key: string]: Anser.AnserJsonEntry[][];
   }>({});
+
   const [prevLogs, setPrevLogs] = useState<{
-    [key: string]: Log[];
+    [key: string]: Anser.AnserJsonEntry[][];
   }>({});
 
   const {
@@ -52,16 +46,14 @@ export const useLogs = (
       )
       .then((res) => res.data);
 
-    const processedLogs: Log[] = events.items.map((evt: any, idx: number) => {
+    let processedLogs = [] as Anser.AnserJsonEntry[][];
+
+    events.items.forEach((evt: any) => {
       let ansiEvtType = evt.type == "Warning" ? "\u001b[31m" : "\u001b[32m";
       let ansiLog = Anser.ansiToJson(
         `${ansiEvtType}${evt.type}\u001b[0m \t \u001b[43m\u001b[34m\t${evt.reason} \u001b[0m \t ${evt.message}`
       );
-
-      return {
-        line: ansiLog,
-        lineNumber: idx + 1,
-      };
+      processedLogs.push(ansiLog);
     });
 
     // SET LOGS FOR SYSTEM
@@ -88,13 +80,12 @@ export const useLogs = (
         )
         .then((res) => res.data);
       // Process logs
-      const processedLogs: Log[] = logs.previous_logs.map((currentLog, idx) => {
-        let ansiLog = Anser.ansiToJson(currentLog);
-        return {
-          line: ansiLog,
-          lineNumber: idx + 1,
-        };
-      });
+      const processedLogs: Anser.AnserJsonEntry[][] = logs.previous_logs.map(
+        (currentLog) => {
+          let ansiLog = Anser.ansiToJson(currentLog);
+          return ansiLog;
+        }
+      );
 
       setPrevLogs((pl) => ({
         ...pl,
@@ -103,60 +94,6 @@ export const useLogs = (
     } catch (error) {}
   };
 
-  /**
-   * Updates the `logs` for `containerName` with `newLogs`
-   * @param containerName Name of the container
-   * @param newLogs New logs to update for
-   */
-  const updateContainerLogs = (containerName: string, newLogs: Log[]) => {
-    setLogs((logs) => {
-      let containerLogs = logs[containerName] || [];
-      const lastLineNumber = containerLogs?.at(-1)?.lineNumber || 0;
-
-      containerLogs.push(
-        ...newLogs.map((l) => ({
-          ...l,
-          lineNumber: lastLineNumber + l.lineNumber,
-        }))
-      );
-      // this is technically not as efficient as things could be
-      // if there are performance issues, a deque can be used in place of a list
-      // for storing logs
-      if (containerLogs.length > MAX_LOGS) {
-        const logsToBeRemoved =
-          newLogs.length < LOGS_BUFFER_SIZE ? newLogs.length : LOGS_BUFFER_SIZE;
-        containerLogs = containerLogs.slice(logsToBeRemoved);
-      }
-
-      if (typeof scroll === "function") {
-        scroll(true);
-      }
-      return {
-        ...logs,
-        [containerName]: containerLogs,
-      };
-    });
-  };
-
-  /**
-   * Flushes the logs buffer. If `containerName` is provided,
-   * it will update logs for the `containerName` before executing
-   * the flush operation
-   * @param containerName Name of the container
-   */
-  const flushLogsBuffer = (containerName?: string) => {
-    if (containerName) {
-      updateContainerLogs(containerName, [
-        ...(logsBufferRef.current[containerName] || []),
-      ]);
-      logsBufferRef.current[containerName] = [];
-      return;
-    }
-
-    // If no container name is provided flush all,
-    logsBufferRef.current = {};
-  };
-
   const setupWebsocket = (containerName: string, websocketKey: string) => {
     if (!currentPod?.metadata?.name) return;
 
@@ -168,20 +105,25 @@ export const useLogs = (
       },
       onmessage: (evt: MessageEvent) => {
         let ansiLog = Anser.ansiToJson(evt.data);
-
-        if (!logsBufferRef.current[containerName]) {
-          logsBufferRef.current[containerName] = [];
-        }
-
-        logsBufferRef.current[containerName].push({
-          line: ansiLog,
-          lineNumber: logsBufferRef.current[containerName].length + 1,
+        setLogs((logs) => {
+          const tmpLogs = { ...logs };
+          let containerLogs = tmpLogs[containerName] || [];
+
+          containerLogs.push(ansiLog);
+          // this is technically not as efficient as things could be
+          // if there are performance issues, a deque can be used in place of a list
+          // for storing logs
+          if (containerLogs.length > MAX_LOGS) {
+            containerLogs.shift();
+          }
+          if (typeof scroll === "function") {
+            scroll(true);
+          }
+          return {
+            ...logs,
+            [containerName]: containerLogs,
+          };
         });
-
-        // If size of the logs buffer is exceeded, immediately flush the buffer
-        if (logsBufferRef.current[containerName].length > LOGS_BUFFER_SIZE) {
-          flushLogsBuffer(containerName);
-        }
       },
       onclose: () => {
         console.log("Closed websocket:", websocketKey);
@@ -196,8 +138,6 @@ export const useLogs = (
     const websocketKey = `${currentPodName.current}-${currentContainer}-websocket`;
     closeWebsocket(websocketKey);
 
-    // Flush and re-initialize empty buffer
-    flushLogsBuffer(currentContainer);
     setPrevLogs((prev) => ({ ...prev, [currentContainer]: [] }));
     setLogs((prev) => ({ ...prev, [currentContainer]: [] }));
 
@@ -234,7 +174,6 @@ export const useLogs = (
 
     closeAllWebsockets();
 
-    flushLogsBuffer();
     setPrevLogs({});
     setLogs({});
 
@@ -260,35 +199,6 @@ export const useLogs = (
     };
   }, []);
 
-  useEffect(() => {
-    flushLogsBuffer(currentContainer);
-  }, []);
-
-  /**
-   * In some situations, we might never hit the limit for the max buffer size.
-   * An example is if the total logs for the pod < LOGS_BUFFER_SIZE.
-   *
-   * For handling situations like this, we would want to force a flush operation
-   * on the buffer so that we dont have any stale logs
-   */
-  useEffect(() => {
-    const flushAllLogs = () =>
-      Object.keys(logsBufferRef.current).forEach((container) =>
-        flushLogsBuffer(container)
-      );
-
-    /**
-     * We dont want users to wait for too long for the initial
-     * logs to appear. So we use a setTimeout for 1s to force-flush
-     * logs after 1s of load
-     */
-    setTimeout(flushAllLogs, 1000);
-
-    const flushLogsBufferInterval = setInterval(flushAllLogs, 5000);
-
-    return () => clearInterval(flushLogsBufferInterval);
-  }, []);
-
   const currentLogs = useMemo(() => {
     return logs[currentContainer] || [];
   }, [currentContainer, logs]);
@@ -300,11 +210,7 @@ export const useLogs = (
   return {
     containers,
     currentContainer,
-    setCurrentContainer: (newContainer: string) => {
-      // First flush the logs of the older container
-      flushLogsBuffer(currentContainer);
-      setCurrentContainer(newContainer);
-    },
+    setCurrentContainer,
     logs: currentLogs,
     previousLogs: currentPreviousLogs,
     refresh,