Fix for #218

apigee · Aug 18, 2023 · c074080 · c074080
1 parent dc06a49
commit c074080
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -267,6 +267,14 @@ To delete the entire proxy or sharedflow, pass the options as `clean`
 mvn clean install -P{profile} -Dbearer=$(gcloud auth print-access-token) -Dapigee.options=clean
 ```
 
+### To just import the proxy or sharedflow without activating (v2.4.1 or later)
+
+To just import the proxy or sharedflow without activating, pass the options as `inactive`
+
+```
+mvn clean install -P{profile} -Dbearer=$(gcloud auth print-access-token) -Dapigee.options=inactive
+```
+
 ### To promote the proxy or sharedflow (v2.4.0 or later)
 
 To promote an existing revision deployed to an Apigee org you can use the `apigee-enterprise:promote` goal

diff --git a/samples/mockapi-recommended/src/gateway/shared-pom.xml b/samples/mockapi-recommended/src/gateway/shared-pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>io.apigee.build-tools.enterprise4g</groupId>
                 <artifactId>apigee-edge-maven-plugin</artifactId>
-                <version>2.4.0</version>
+                <version>2.4.1</version>
                 <executions>
                     <execution>
                         <id>configure-bundle</id>
@@ -106,7 +106,7 @@
                 <apigee.authtype>oauth</apigee.authtype> <!-- only option -->
                 <apigee.bearer>${bearer}</apigee.bearer> <!-- this takes precedence over service account file -->                
                 <apigee.serviceaccount.file>${file}</apigee.serviceaccount.file>
-                <apigee.options>override</apigee.options> <!-- override is default. Other options are async|clean-->
+                <apigee.options>override</apigee.options> <!-- override is default. Other options are async|inactive|clean -->
                 <apigee.googletoken.email>${googleTokenEmail}</apigee.googletoken.email> <!-- Available in Apigee X and Apigee hybrid 1.6 + -->
             </properties>
         </profile>
@@ -121,7 +121,7 @@
                 <apigee.authtype>oauth</apigee.authtype> <!-- only option -->
                 <apigee.bearer>${bearer}</apigee.bearer> <!-- this takes precedence over service account file -->
                 <apigee.serviceaccount.file>${file}</apigee.serviceaccount.file>
-                <apigee.options>override</apigee.options> <!-- override is default. Other options are async|clean-->
+                <apigee.options>override</apigee.options> <!-- override is default. Other options are async|inactive|clean -->
                 <apigee.googletoken.email>${googleTokenEmail}</apigee.googletoken.email> <!-- Available in Apigee X and Apigee hybrid 1.6 + -->
             </properties>
         </profile>

diff --git a/samples/security-sharedflow/src/sharedflows/parent-sharedflow-pom.xml b/samples/security-sharedflow/src/sharedflows/parent-sharedflow-pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>io.apigee.build-tools.enterprise4g</groupId>
                 <artifactId>apigee-edge-maven-plugin</artifactId>
-                <version>2.4.0</version>
+                <version>2.4.1</version>
                 <executions>
                     <execution>
                         <id>configure-bundle</id>
@@ -107,7 +107,7 @@
                 <apigee.authtype>oauth</apigee.authtype> <!-- only option -->
                 <apigee.bearer>${bearer}</apigee.bearer> <!-- this takes precedence over service account file -->
                 <apigee.serviceaccount.file>${file}</apigee.serviceaccount.file>
-                <apigee.options>override</apigee.options> <!-- override is default. Other options are async|clean-->
+                <apigee.options>override</apigee.options> <!-- override is default. Other options are async|inactive|clean -->
                 <apigee.googletoken.email>${googleTokenEmail}</apigee.googletoken.email> <!-- Available in Apigee X and Apigee hybrid 1.6 + -->
             </properties>
         </profile>
@@ -123,7 +123,7 @@
                 <apigee.authtype>oauth</apigee.authtype> <!-- only option -->
                 <apigee.bearer>${bearer}</apigee.bearer> <!-- this takes precedence over service account file -->
                 <apigee.serviceaccount.file>${file}</apigee.serviceaccount.file>
-                <apigee.options>override</apigee.options> <!-- override is default. Other options are async|clean-->
+                <apigee.options>override</apigee.options> <!-- override is default. Other options are async|inactive|clean -->
                 <apigee.googletoken.email>${googleTokenEmail}</apigee.googletoken.email> <!-- Available in Apigee X and Apigee hybrid 1.6 + -->
             </properties>
         </profile>

diff --git a/src/main/java/io/apigee/buildTools/enterprise4g/mavenplugin/DeployMojo.java b/src/main/java/io/apigee/buildTools/enterprise4g/mavenplugin/DeployMojo.java
@@ -56,11 +56,11 @@ enum State {
 	}
 
 	enum BUILDOPTIONS {
-		NULL,clean
+		NULL,clean,inactive
 	}
 
 	enum OPTIONS {
-		override,async,clean
+		override,async,clean,inactive
 	}
 
 	State state = State.START;
@@ -119,6 +119,10 @@ public void init() throws IOException, MojoFailureException,Exception {
 						Options.clean=true;
 						buildOption=BUILDOPTIONS.valueOf("clean");
 						break;
+					case inactive:
+						Options.inactive=true;
+						buildOption=BUILDOPTIONS.valueOf("inactive");
+						break;
 					default:
 						break;
 					}
@@ -295,6 +299,9 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 				case clean:
 						doDelete();
 						break;
+				case inactive:
+						doImport();
+						break;
 				default:     
 						break;
 			}