Merge pull request #207 from devsapp/fix-custom-domain-methods

fix custom domain methods and acree push
devsapp · Nov 6, 2023 · 03f45e0 · 03f45e0
2 parents 8ae01ff + c914054
commit 03f45e0
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 82 deletions.
diff --git a/dist/build/Release/cpufeatures.node b/dist/build/Release/cpufeatures.node
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/lib/protocol/crypto/build/Release/sshcrypto.node b/dist/lib/protocol/crypto/build/Release/sshcrypto.node
diff --git a/publish.yaml b/publish.yaml
@@ -2,7 +2,7 @@ Type: Component
 Name: fc-deploy
 Provider:
   - 阿里云
-Version: 0.0.119
+Version: 0.0.120
 Description: 阿里云函数计算基础组件
 HomePage: https://github.com/devsapp/fc-base
 Tags:

diff --git a/src/lib/fc/custom-domain.ts b/src/lib/fc/custom-domain.ts
@@ -245,14 +245,14 @@ export class FcCustomDomain extends IInputsBase {
           functionName: this.functionName,
         });
       }
-      if (!Object.prototype.hasOwnProperty.call(routeConfig, 'methods')) {
-        this.logger.debug(
-          `set default methods: ${this.httpMethods} for domain: ${this.customDomainConf.domainName}`,
-        );
-        Object.assign(routeConfig, {
-          methods: this.httpMethods,
-        });
-      }
+      // if (!Object.prototype.hasOwnProperty.call(routeConfig, 'methods')) {
+      //   this.logger.debug(
+      //     `set default methods: ${this.httpMethods} for domain: ${this.customDomainConf.domainName}`,
+      //   );
+      //   Object.assign(routeConfig, {
+      //     methods: this.httpMethods,
+      //   });
+      // }
       resolvedRouteConfigs.push(routeConfig);
     }
     Object.assign(resolvedCustomDomainConf, {

diff --git a/src/lib/resource/acr.ts b/src/lib/resource/acr.ts
@@ -196,13 +196,13 @@ export class AlicloudAcr extends AlicloudClient {
     }
     // try to push image
     try {
-      this.logger.log(`Pushing docker image: ${image}...`, 'yellow');
+      this.logger.log(`Pushing docker image: ${image} ...`, 'yellow');
       execSync(`docker push ${image}`, { stdio: 'inherit' });
       return retryErrorAcrNotExist;
     } catch (e) {
-      if (image === resolvedImage) {
-        throw e;
-      }
+      // if (image === resolvedImage) {
+      //   throw e;
+      // }
       this.logger.warn(StdoutFormatter.stdoutFormatter.warn('failed', `push image: ${image}`));
       this.logger.debug(`Push image: ${image} failed， error is ${e}`);
     }