Cherry-pick #5096 #5099 #5108 #5113 #5114 #5115 #5116 #5118 #5126 (#5136

) * Set fetch-depth to 0 to create correct patches during git cherry-pick as much as possible (#5096) Signed-off-by: Yoshiki Fujikane <[email protected]> Signed-off-by: pipecd-bot <[email protected]> * Bump postcss from 7.0.39 to 8.4.40 in /docs (#5099) Bumps [postcss](https://github.com/postcss/postcss) from 7.0.39 to 8.4.40. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@7.0.39...8.4.40) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: pipecd-bot <[email protected]> * Use LRUCache for Application Manifests Cache (#5108) * Use LRUCache for Application Manifests Cache Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]> * Use not constant but config value Co-authored-by: Yoshiki Fujikane <[email protected]> Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]> --------- Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]> Co-authored-by: Yoshiki Fujikane <[email protected]> Signed-off-by: pipecd-bot <[email protected]> * Fix UI dependecies deprecated (#5113) Signed-off-by: khanhtc1202 <[email protected]> Signed-off-by: pipecd-bot <[email protected]> * Bump postcss and autoprefixer in /docs (#5114) Bumps [postcss](https://github.com/postcss/postcss) to 8.4.40 and updates ancestor dependency [autoprefixer](https://github.com/postcss/autoprefixer). These dependencies need to be updated together. Updates `postcss` from 7.0.39 to 8.4.40 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@7.0.39...8.4.40) Updates `autoprefixer` from 9.8.8 to 10.4.20 - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](postcss/autoprefixer@9.8.8...10.4.20) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect - dependency-name: autoprefixer dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: pipecd-bot <[email protected]> * fix: upgrade google-protobuf from 3.21.0 to 3.21.4 (#5115) Snyk has created this PR to upgrade google-protobuf from 3.21.0 to 3.21.4. See this package in yarn: google-protobuf See this project in Snyk: https://app.snyk.io/org/pipecd/project/f41c5767-b506-4f59-beb9-ef662258eb9a?utm_source=github&utm_medium=referral&page=upgrade-pr Signed-off-by: t-kikuc <[email protected]> Co-authored-by: snyk-bot <[email protected]> Signed-off-by: pipecd-bot <[email protected]> * fix: upgrade react-markdown from 6.0.2 to 6.0.3 (#5116) Snyk has created this PR to upgrade react-markdown from 6.0.2 to 6.0.3. See this package in yarn: react-markdown See this project in Snyk: https://app.snyk.io/org/pipecd/project/f41c5767-b506-4f59-beb9-ef662258eb9a?utm_source=github&utm_medium=referral&page=upgrade-pr Signed-off-by: t-kikuc <[email protected]> Co-authored-by: snyk-bot <[email protected]> Signed-off-by: pipecd-bot <[email protected]> * fix: tool/actions-gh-release/Dockerfile to reduce vulnerabilities (#5118) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-ALPINE320-OPENSSL-7413532 - https://snyk.io/vuln/SNYK-ALPINE320-OPENSSL-7413532 Signed-off-by: khanhtc1202 <[email protected]> Co-authored-by: snyk-bot <[email protected]> Signed-off-by: pipecd-bot <[email protected]> * fix: upgrade dayjs from 1.8.28 to 1.11.12 (#5126) Snyk has created this PR to upgrade dayjs from 1.8.28 to 1.11.12. See this package in yarn: dayjs See this project in Snyk: https://app.snyk.io/org/pipecd/project/f41c5767-b506-4f59-beb9-ef662258eb9a?utm_source=github&utm_medium=referral&page=upgrade-pr Signed-off-by: t-kikuc <[email protected]> Co-authored-by: snyk-bot <[email protected]> Signed-off-by: pipecd-bot <[email protected]> --------- Signed-off-by: Yoshiki Fujikane <[email protected]> Signed-off-by: pipecd-bot <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]> Signed-off-by: khanhtc1202 <[email protected]> Signed-off-by: t-kikuc <[email protected]> Co-authored-by: Yoshiki Fujikane <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shinnosuke Sawada-Dazai <[email protected]> Co-authored-by: Khanh Tran <[email protected]> Co-authored-by: snyk-bot <[email protected]> Co-authored-by: Chris Aniszczyk <[email protected]>
pipe-cd · Aug 15, 2024 · d8d1df0 · d8d1df0
1 parent 49f7ec0
commit d8d1df0
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 99 deletions.
diff --git a/.github/workflows/cherry_pick.yaml b/.github/workflows/cherry_pick.yaml
@@ -16,6 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: make a cherry-pick PR
         run: |
           git config user.name "pipecd-bot"

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/google/docsy-example#readme",
   "devDependencies": {
-    "autoprefixer": "^9.8.6",
+    "autoprefixer": "^10.4.20",
     "postcss": "^8.4.31",
     "postcss-cli": "^8.3.1"
   }

diff --git a/pkg/app/piped/cmd/piped/piped.go b/pkg/app/piped/cmd/piped/piped.go
@@ -99,6 +99,7 @@ type piped struct {
 	addLoginUserToPasswd                 bool
 	launcherVersion                      string
 	maxRecvMsgSize                       int
+	appManifestCacheCount                int
 }
 
 func NewCommand() *cobra.Command {
@@ -107,10 +108,11 @@ func NewCommand() *cobra.Command {
 		panic(fmt.Sprintf("failed to detect the current user's home directory: %v", err))
 	}
 	p := &piped{
-		adminPort:      9085,
-		toolsDir:       path.Join(home, ".piped", "tools"),
-		gracePeriod:    30 * time.Second,
-		maxRecvMsgSize: 1024 * 1024 * 10, // 10MB
+		adminPort:             9085,
+		toolsDir:              path.Join(home, ".piped", "tools"),
+		gracePeriod:           30 * time.Second,
+		maxRecvMsgSize:        1024 * 1024 * 10, // 10MB
+		appManifestCacheCount: 150,
 	}
 	cmd := &cobra.Command{
 		Use:   "piped",
@@ -131,6 +133,7 @@ func NewCommand() *cobra.Command {
 	cmd.Flags().BoolVar(&p.enableDefaultKubernetesCloudProvider, "enable-default-kubernetes-cloud-provider", p.enableDefaultKubernetesCloudProvider, "Whether the default kubernetes provider is enabled or not. This feature is deprecated.")
 	cmd.Flags().BoolVar(&p.addLoginUserToPasswd, "add-login-user-to-passwd", p.addLoginUserToPasswd, "Whether to add login user to $HOME/passwd. This is typically for applications running as a random user ID.")
 	cmd.Flags().DurationVar(&p.gracePeriod, "grace-period", p.gracePeriod, "How long to wait for graceful shutdown.")
+	cmd.Flags().IntVar(&p.appManifestCacheCount, "app-manifest-cache-count", p.appManifestCacheCount, "The number of app manifests to cache. The cache-key contains the commit hash. The default is 150.")
 
 	cmd.Flags().StringVar(&p.launcherVersion, "launcher-version", p.launcherVersion, "The version of launcher which initialized this Piped.")
 
@@ -344,7 +347,11 @@ func (p *piped) run(ctx context.Context, input cli.Input) (runErr error) {
 	analysisResultStore := analysisresultstore.NewStore(apiClient, input.Logger)
 
 	// Create memory caches.
-	appManifestsCache := memorycache.NewTTLCache(ctx, time.Hour, time.Minute)
+	appManifestsCache, err := memorycache.NewLRUCache(p.appManifestCacheCount)
+	if err != nil {
+		input.Logger.Error("failed to create app manifests cache", zap.Error(err))
+		return err
+	}
 
 	var liveStateGetter livestatestore.Getter
 	// Start running application live state store.

diff --git a/tool/actions-gh-release/Dockerfile b/tool/actions-gh-release/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.4-alpine3.20
+FROM golang:1.22.5-alpine3.20
 
 RUN apk update && apk add git
 

diff --git a/web/package.json b/web/package.json
@@ -70,11 +70,11 @@
     "@types/yup": "^0.29.14",
     "clsx": "^1.2.1",
     "dagre": "^0.8.5",
-    "dayjs": "^1.8.28",
+    "dayjs": "^1.11.12",
     "dotenv": "^8.6.0",
     "echarts": "^5.5.1",
     "formik": "^2.2.9",
-    "google-protobuf": "^3.15.6",
+    "google-protobuf": "^3.21.4",
     "grpc-web": "^1.5.0",
     "history": "^4.10.1",
     "path-browserify": "^1.0.1",
@@ -84,7 +84,7 @@
     "react-dom": "^17.0.2",
     "react-draggable": "^4.4.6",
     "react-intersection-observer": "^8.26.2",
-    "react-markdown": "^6.0.2",
+    "react-markdown": "^6.0.3",
     "react-redux": "^7.2.9",
     "react-router-dom": "^5.3.4",
     "react-syntax-highlighter": "^15.5.0",

diff --git a/web/src/components/applications-page/application-list/delete-application-dialog/index.tsx b/web/src/components/applications-page/application-list/delete-application-dialog/index.tsx
@@ -83,7 +83,14 @@ export const DeleteApplicationDialog: FC<DeleteApplicationDialogProps> = memo(
     }, [dispatch]);
 
     return (
-      <Dialog open={Boolean(application)} disableBackdropClick={isDeleting}>
+      <Dialog
+        open={Boolean(application)}
+        onClose={(_event, reason) => {
+          if (reason !== "backdropClick" || !isDeleting) {
+            handleCancel();
+          }
+        }}
+      >
         <DialogTitle>{TITLE}</DialogTitle>
         <DialogContent>
           <Alert severity="error" className={classes.description}>

diff --git a/web/src/components/applications-page/application-list/index.tsx b/web/src/components/applications-page/application-list/index.tsx
@@ -194,7 +194,7 @@ export const ApplicationList: FC<ApplicationListProps> = memo(
                   onPageChange={(_, newPage) => {
                     onPageChange(newPage + 1);
                   }}
-                  onChangeRowsPerPage={(e) => {
+                  onRowsPerPageChange={(e) => {
                     setRowsPerPage(parseInt(e.target.value, 10));
                     onPageChange(1);
                   }}

diff --git a/web/src/components/applications-page/application-list/sealed-secret-dialog/index.tsx b/web/src/components/applications-page/application-list/sealed-secret-dialog/index.tsx
@@ -102,7 +102,13 @@ export const SealedSecretDialog: FC<SealedSecretDialogProps> = memo(
     }
 
     return (
-      <Dialog open={open} onEnter={handleOnEnter} onClose={handleClose}>
+      <Dialog
+        open={open}
+        TransitionProps={{
+          onEnter: handleOnEnter,
+        }}
+        onClose={handleClose}
+      >
         {sealedSecret ? (
           <>
             <DialogTitle>{DIALOG_TITLE}</DialogTitle>

diff --git a/web/src/theme.ts b/web/src/theme.ts
@@ -1,4 +1,4 @@
-import { createMuiTheme } from "@material-ui/core/styles";
+import { createTheme } from "@material-ui/core/styles";
 import cyan from "@material-ui/core/colors/cyan";
 
 declare module "@material-ui/core/styles/createTypography" {
@@ -11,7 +11,7 @@ declare module "@material-ui/core/styles/createTypography" {
   }
 }
 
-export const theme = createMuiTheme({
+export const theme = createTheme({
   props: {
     MuiButtonBase: {
       disableRipple: true,