Merge pull request #1 from alexandramartinez/feature/2.0.0

Feature/2.0.0
alexandramartinez · Feb 20, 2024 · bc93f2e · bc93f2e
2 parents ba7005f + 5a65f7f
commit bc93f2e
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.vscode/
diff --git a/data-cloud-integration-impl/pom.xml b/data-cloud-integration-impl/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>YOUR_ORG_ID</groupId>
     <artifactId>data-cloud-integration-impl</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
     <packaging>mule-application</packaging>
     <name>Data Cloud Integration App</name>
     <properties>

diff --git a/data-cloud-integration-impl/src/main/mule/global.xml b/data-cloud-integration-impl/src/main/mule/global.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<mule xmlns="http://www.mulesoft.org/schema/mule/core" xmlns:doc="http://www.mulesoft.org/schema/mule/documentation" xmlns:ee="http://www.mulesoft.org/schema/mule/ee/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sdc="http://www.mulesoft.org/schema/mule/sdc" xmlns:http="http://www.mulesoft.org/schema/mule/http" xmlns:secure-properties="http://www.mulesoft.org/schema/mule/secure-properties"
-	xmlns:apikit="http://www.mulesoft.org/schema/mule/mule-apikit" xsi:schemaLocation="http://www.mulesoft.org/schema/mule/core http://www.mulesoft.org/schema/mule/core/current/mule.xsd
+<mule xmlns:api-gateway="http://www.mulesoft.org/schema/mule/api-gateway" xmlns="http://www.mulesoft.org/schema/mule/core" xmlns:doc="http://www.mulesoft.org/schema/mule/documentation" xmlns:ee="http://www.mulesoft.org/schema/mule/ee/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sdc="http://www.mulesoft.org/schema/mule/sdc" xmlns:http="http://www.mulesoft.org/schema/mule/http" xmlns:secure-properties="http://www.mulesoft.org/schema/mule/secure-properties" xmlns:apikit="http://www.mulesoft.org/schema/mule/mule-apikit" xsi:schemaLocation="http://www.mulesoft.org/schema/mule/core http://www.mulesoft.org/schema/mule/core/current/mule.xsd
     http://www.mulesoft.org/schema/mule/ee/core http://www.mulesoft.org/schema/mule/ee/core/current/mule-ee.xsd
 	http://www.mulesoft.org/schema/mule/sdc http://www.mulesoft.org/schema/mule/sdc/current/mule-sdc.xsd
 	http://www.mulesoft.org/schema/mule/http http://www.mulesoft.org/schema/mule/http/current/mule-http.xsd
 	http://www.mulesoft.org/schema/mule/secure-properties http://www.mulesoft.org/schema/mule/secure-properties/current/mule-secure-properties.xsd
-	http://www.mulesoft.org/schema/mule/mule-apikit http://www.mulesoft.org/schema/mule/mule-apikit/current/mule-apikit.xsd">
+	http://www.mulesoft.org/schema/mule/mule-apikit http://www.mulesoft.org/schema/mule/mule-apikit/current/mule-apikit.xsd
+http://www.mulesoft.org/schema/mule/api-gateway http://www.mulesoft.org/schema/mule/api-gateway/current/mule-api-gateway.xsd">
     <!-- UNCOMMENT FOR SECURED PROPERTIES
     <sdc:sdc-config name="Salesforce_CDP_Sdc_config">
         <sdc:oauth-user-pass-connection clientId="${secure::cdp.consumer.key}" clientSecret="${secure::cdp.consumer.secret}" username="${secure::salesforce.username}" password="${secure::salesforce.password}" audienceUrl="${salesforce.url}" />
@@ -18,9 +18,11 @@
     <sdc:sdc-config name="Salesforce_CDP_Sdc_config">
         <sdc:oauth-user-pass-connection clientId="${cdp.consumer.key}" clientSecret="${cdp.consumer.secret}" username="${salesforce.username}" password="${salesforce.password}" audienceUrl="${salesforce.url}" />
     </sdc:sdc-config>
-    <configuration-properties file="props.yaml" doc:name="Configuration properties" />
+    <configuration-properties file="${env}.props.yaml" doc:name="Configuration properties" />
+    <global-property name="env" value="dev" />
     <http:listener-config name="data-cloud-integration-api-httpListenerConfig">
         <http:listener-connection host="${http.listener.host}" port="${http.listener.port}" />
     </http:listener-config>
     <apikit:config name="data-cloud-integration-api-config" api="data-cloud-integration-api.raml" outboundHeadersMapName="outboundHeaders" httpStatusVarName="httpStatus" />
+    <api-gateway:autodiscovery apiId="${api.id}" ignoreBasePath="true" doc:name="API Autodiscovery" doc:id="e6cddcc9-7dfb-42eb-9507-3a04cf813a5a" flowRef="data-cloud-integration-api-main" />
 </mule>
diff --git a/data-cloud-integration-impl/src/main/resources/deploy.json b/data-cloud-integration-impl/src/main/resources/deploy.json
@@ -3,5 +3,8 @@
   "workerSize": 0.1,
   "applicationName": "data-cloud-integration-impl",
   "workers": 1,
-  "autoStart": true
+  "autoStart": true,
+  "properties": {
+    "anypoint.platform.gatekeeper": "disabled"
+  }
 }
diff --git a/...ration-impl/src/main/resources/props.yaml → ...on-impl/src/main/resources/dev.props.yaml b/...ration-impl/src/main/resources/props.yaml → ...on-impl/src/main/resources/dev.props.yaml
@@ -5,3 +5,6 @@ http:
   listener:
     host: "0.0.0.0"
     port: "8081"
+
+api:
+  id: "12345678"
diff --git a/data-cloud-integration-impl/src/main/resources/local.props.yaml b/data-cloud-integration-impl/src/main/resources/local.props.yaml
@@ -0,0 +1,22 @@
+salesforce:
+  url: "https://login.salesforce.com/"
+  username: "your_username"
+  password: "your_password"
+
+http:
+  listener:
+    host: "0.0.0.0"
+    port: "8081"
+
+cdp:
+  consumer:
+    key: "your_key"
+    secret: "your_secret"
+
+anypoint:
+  platform:
+    client_id: "your_environments_client_id"
+    client_secret: "your_environments_client_secret"
+
+api:
+  id: "your_api_id"