LPD-65328 Automate AWS Marketplace Product release

build-test.xml

@@ -14540,8 +14540,7 @@ analytics.cloud.domain.allowed=*</echo>
 	</target>
 
 	<target name="prepare-system-ext-properties">
-		<echo file="${app.server.classes.portal.dir}/system-ext.properties">jdbc.data.source.anti.time.drift=true
-log.sanitizer.enabled=false</echo>
+		<echo file="${app.server.classes.portal.dir}/system-ext.properties">log.sanitizer.enabled=false</echo>
 
 		<get-testcase-property property.name="custom.system.properties" />
 

cloud/helm/aws-marketplace/marketplace_product_release.sh

@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+PRODUCT_VERSION="${1?Argument specifying new AWS Marketplace product version is required.}"
+
+DETAILS_JSON='{
+	"DeliveryOptions": [
+		{
+			"Details": {
+				"ContainerProductDeliveryOptionDetails": {
+					"ContainerImages": [
+						{
+							"ImageDigest": "sha256:abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
+							"ImageTag": "latest"
+						}
+					],
+					"DeliveryOptionTitle": "Deploy using Helm and Terraform",
+					"DeliveryOptionType": "Public",
+					"Description": "This option supports deployment of Liferay using Helm and Terraform.\n\nService Dependencies\n\nThere are 3 service dependencies which are instantiated using Terraform scripts; an RDS Postgres database, an OpenSearch domain and an S3 bucket.\n\nThese are created within the AWS account executing the Terraform scripts and are fully under control of the account owner.",
+					"EcrRepositoryArn": "arn:aws:ecr:us-east-1:123456789012:repository/my-ecr-repo",
+					"EcrRepositoryName": "liferay/charts",
+					"HelmInstallationNamespace": "liferay-system",
+					"HelmReleaseName": "liferay",
+					"KubernetesServiceAccountName": "liferay-default",
+					"SupportedRegions": [
+						"us-east-1",
+						"us-west-2"
+					],
+					"SupportedServices": [
+						"Amazon Elastic Kubernetes Service (EKS)"
+					]
+				}
+			},
+			"Type": "[email protected]"
+		}
+	],
+	"Version": {
+		"ReleaseNotes": "My new Release notes",
+		"VersionTitle": "'${PRODUCT_VERSION}'"
+	}
+}'
+ENTITY_ID="prod-7xd5pjyie6zee"
+ENTITY_TYPE="[email protected]"
+
+CHANGE_SET_JSON='[
+	{
+		"ChangeType": "AddDeliveryOptions",
+		"Details": '"${DETAILS_JSON}"',
+		"Entity": {
+			"Identifier": "'${ENTITY_ID}'",
+			"Type": "'${ENTITY_TYPE}'"
+		}
+	}
+]'
+CHANGE_SET_JSON_STRING=$(echo "${CHANGE_SET_JSON}" | jq 'tostring')
+
+configure_aws() {
+	aws sso login
+}
+
+start_change_set() {
+	aws marketplate-catalog start-change-set \
+		--catalog "AWSMarketplace" \
+		--change-set "${CHANGE_SET_JSON_STRING}"
+}
+
+main() {
+	echo "Using product version: ${PRODUCT_VERSION}"
+
+	configure_aws
+
+	start_change_set
+}
+
+main

modules/_node-scripts/package.json

@@ -4,7 +4,7 @@
 		"node-scripts": "./bin.js"
 	},
 	"com.liferay": {
-		"sha256": "a1b7193ab466d4b18f5860052c29db07e162ca555487fd5df04397fcfabab538"
+		"sha256": "aeb088fa34d190f5b8bcf73621f691c1cd574d46cb652f080050c359672381ad"
 	},
 	"dependencies": {
 		"@babel/preset-env": "7.24.7",

modules/_node-scripts/preflight/checkPackageJSONFiles.mjs

@@ -274,7 +274,6 @@ const ALLOWED_NAMED_SCOPE_EXCEPTIONS = [
 	'frontend-js-aui-web',
 	'frontend-js-clay-sample-web',
 	'frontend-js-components-web',
-	'frontend-js-item-selector-web',
 	'frontend-js-jquery-web',
 	'frontend-js-loader-modules-extender',
 	'frontend-js-lodash-web',

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/BaseCommerceContext.java

@@ -32,7 +32,6 @@
 import com.liferay.portal.configuration.module.configuration.ConfigurationProvider;
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.settings.GroupServiceSettingsLocator;
@@ -241,10 +240,6 @@ public int getCommerceSiteType() {
 
 	@Override
 	public long getCPConfigurationListId(long groupId) throws PortalException {
-		if (!FeatureFlagManagerUtil.isEnabled(_companyId, "LPD-10889")) {
-			return 0;
-		}
-
 		Map<Long, CPConfigurationList> cpConfigurationLists =
 			_getCPConfigurationLists();
 

modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/BaseCommerceContextHttp.java

@@ -34,7 +34,6 @@
 import com.liferay.portal.kernel.cookies.CookiesManagerUtil;
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.settings.GroupServiceSettingsLocator;
@@ -306,12 +305,6 @@ public int getCommerceSiteType() {
 
 	@Override
 	public long getCPConfigurationListId(long groupId) throws PortalException {
-		if (!FeatureFlagManagerUtil.isEnabled(
-				_portal.getCompanyId(_httpServletRequest), "LPD-10889")) {
-
-			return 0;
-		}
-
 		Map<Long, CPConfigurationList> cpConfigurationLists =
 			_getCPConfigurationLists();
 

modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/helper/ProductHelperImpl.java

@@ -15,7 +15,6 @@
 import com.liferay.commerce.frontend.helper.ProductHelper;
 import com.liferay.commerce.frontend.model.PriceModel;
 import com.liferay.commerce.frontend.model.ProductSettingsModel;
-import com.liferay.commerce.model.CPDefinitionInventory;
 import com.liferay.commerce.percentage.PercentageFormatter;
 import com.liferay.commerce.price.CommerceProductPrice;
 import com.liferay.commerce.price.CommerceProductPriceCalculation;
@@ -30,11 +29,8 @@
 import com.liferay.commerce.product.service.CPDefinitionLocalService;
 import com.liferay.commerce.product.service.CPInstanceLocalService;
 import com.liferay.commerce.product.service.CommerceChannelLocalService;
-import com.liferay.commerce.service.CPDefinitionInventoryLocalService;
 import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
 import com.liferay.portal.kernel.language.Language;
-import com.liferay.portal.kernel.security.auth.CompanyThreadLocal;
 import com.liferay.portal.kernel.util.ResourceBundleUtil;
 import com.liferay.portal.kernel.util.Validator;
 
@@ -145,74 +141,40 @@ public ProductSettingsModel getProductSettingsModel(
 		BigDecimal multipleQuantity =
 			CPDefinitionInventoryConstants.DEFAULT_MULTIPLE_ORDER_QUANTITY;
 
-		if (FeatureFlagManagerUtil.isEnabled(
-				CompanyThreadLocal.getCompanyId(), "LPD-10889")) {
+		CPDefinition cpDefinition = _cpDefinitionLocalService.fetchCPDefinition(
+			cpDefinitionId);
 
-			CPDefinition cpDefinition =
-				_cpDefinitionLocalService.fetchCPDefinition(cpDefinitionId);
+		if (cpDefinition != null) {
+			CPConfigurationEntry cpConfigurationEntry =
+				cpDefinition.fetchCPConfigurationEntry(
+					commerceContext.getCPConfigurationListId(
+						cpDefinition.getGroupId()));
 
-			if (cpDefinition != null) {
-				CPConfigurationEntry cpConfigurationEntry =
-					cpDefinition.fetchCPConfigurationEntry(
-						commerceContext.getCPConfigurationListId(
-							cpDefinition.getGroupId()));
-
-				if (cpConfigurationEntry == null) {
-					cpConfigurationEntry =
-						cpDefinition.fetchMasterCPConfigurationEntry();
-				}
-
-				minOrderQuantity = cpConfigurationEntry.getMinOrderQuantity();
-				maxOrderQuantity = cpConfigurationEntry.getMaxOrderQuantity();
-				multipleQuantity =
-					cpConfigurationEntry.getMultipleOrderQuantity();
-
-				BigDecimal[] allowedOrderQuantitiesArray =
-					cpConfigurationEntry.getAllowedOrderQuantitiesArray();
-
-				if ((allowedOrderQuantitiesArray != null) &&
-					(allowedOrderQuantitiesArray.length > 0)) {
-
-					productSettingsModel.setAllowedQuantities(
-						allowedOrderQuantitiesArray);
-				}
-
-				productSettingsModel.setBackOrders(
-					cpConfigurationEntry.isBackOrders());
-				productSettingsModel.setLowStockQuantity(
-					cpConfigurationEntry.getMinStockQuantity());
-				productSettingsModel.setShowAvailabilityDot(
-					cpConfigurationEntry.isDisplayAvailability());
+			if (cpConfigurationEntry == null) {
+				cpConfigurationEntry =
+					cpDefinition.fetchMasterCPConfigurationEntry();
 			}
-		}
-		else {
-			CPDefinitionInventory cpDefinitionInventory =
-				_cpDefinitionInventoryLocalService.
-					fetchCPDefinitionInventoryByCPDefinitionId(cpDefinitionId);
 
-			if (cpDefinitionInventory != null) {
-				minOrderQuantity = cpDefinitionInventory.getMinOrderQuantity();
-				maxOrderQuantity = cpDefinitionInventory.getMaxOrderQuantity();
-				multipleQuantity =
-					cpDefinitionInventory.getMultipleOrderQuantity();
+			minOrderQuantity = cpConfigurationEntry.getMinOrderQuantity();
+			maxOrderQuantity = cpConfigurationEntry.getMaxOrderQuantity();
+			multipleQuantity = cpConfigurationEntry.getMultipleOrderQuantity();
 
-				BigDecimal[] allowedOrderQuantitiesArray =
-					cpDefinitionInventory.getAllowedOrderQuantitiesArray();
+			BigDecimal[] allowedOrderQuantitiesArray =
+				cpConfigurationEntry.getAllowedOrderQuantitiesArray();
 
-				if ((allowedOrderQuantitiesArray != null) &&
-					(allowedOrderQuantitiesArray.length > 0)) {
-
-					productSettingsModel.setAllowedQuantities(
-						allowedOrderQuantitiesArray);
-				}
+			if ((allowedOrderQuantitiesArray != null) &&
+				(allowedOrderQuantitiesArray.length > 0)) {
 
-				productSettingsModel.setBackOrders(
-					cpDefinitionInventory.isBackOrders());
-				productSettingsModel.setLowStockQuantity(
-					cpDefinitionInventory.getMinStockQuantity());
-				productSettingsModel.setShowAvailabilityDot(
-					cpDefinitionInventory.isDisplayAvailability());
+				productSettingsModel.setAllowedQuantities(
+					allowedOrderQuantitiesArray);
 			}
+
+			productSettingsModel.setBackOrders(
+				cpConfigurationEntry.isBackOrders());
+			productSettingsModel.setLowStockQuantity(
+				cpConfigurationEntry.getMinStockQuantity());
+			productSettingsModel.setShowAvailabilityDot(
+				cpConfigurationEntry.isDisplayAvailability());
 		}
 
 		productSettingsModel.setMinQuantity(minOrderQuantity);
@@ -351,10 +313,6 @@ private PriceModel _updatePriceModelDiscount(
 	@Reference
 	private CommerceProductPriceCalculation _commerceProductPriceCalculation;
 
-	@Reference
-	private CPDefinitionInventoryLocalService
-		_cpDefinitionInventoryLocalService;
-
 	@Reference
 	private CPDefinitionLocalService _cpDefinitionLocalService;
 

modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnContentDisplayContext.java

@@ -828,8 +828,8 @@ private String _getCommerceOrderItemIds() throws PortalException {
 					objectEntry.getGroupId(),
 					commerceReturnToCommerceReturnItems.
 						getObjectRelationshipId(),
-					null, commerceReturn.getId(), true, null, QueryUtil.ALL_POS,
-					QueryUtil.ALL_POS, null),
+					null, false, commerceReturn.getId(), true, null,
+					QueryUtil.ALL_POS, QueryUtil.ALL_POS, null),
 				curObjectEntry -> {
 					Map<String, Serializable> values =
 						curObjectEntry.getValues();

modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceWishListsCommerceOrderImporterTypeImpl.java

@@ -34,7 +34,6 @@
 import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
 import com.liferay.portal.kernel.language.Language;
 import com.liferay.portal.kernel.service.UserLocalService;
 import com.liferay.portal.kernel.util.ParamUtil;
@@ -223,29 +222,21 @@ private CommerceOrderImporterItemImpl _toCommerceOrderImporterItemImpl(
 				cpDefinition.getCPDefinitionId());
 			commerceOrderImporterItemImpl.setNameMap(cpDefinition.getNameMap());
 
-			long cpConfigurationListId = 0;
+			CommerceChannel commerceChannel =
+				_commerceChannelLocalService.getCommerceChannelByGroupId(
+					commerceOrder.getGroupId());
 
-			if (FeatureFlagManagerUtil.isEnabled(
-					cpInstance.getCompanyId(), "LPD-10889")) {
-
-				CommerceChannel commerceChannel =
-					_commerceChannelLocalService.getCommerceChannelByGroupId(
-						commerceOrder.getGroupId());
-
-				CPConfigurationList cpConfigurationList =
-					_cpConfigurationListDiscovery.getCPConfigurationList(
-						cpInstance.getCompanyId(), cpInstance.getGroupId(),
-						commerceOrder.getCommerceAccountId(),
-						commerceChannel.getCommerceChannelId(),
-						commerceOrder.getCommerceOrderTypeId());
-
-				cpConfigurationListId =
-					cpConfigurationList.getCPConfigurationListId();
-			}
+			CPConfigurationList cpConfigurationList =
+				_cpConfigurationListDiscovery.getCPConfigurationList(
+					cpInstance.getCompanyId(), cpInstance.getGroupId(),
+					commerceOrder.getCommerceAccountId(),
+					commerceChannel.getCommerceChannelId(),
+					commerceOrder.getCommerceOrderTypeId());
 
 			commerceOrderImporterItemImpl.setQuantity(
 				_cpDefinitionInventoryEngine.getMinOrderQuantity(
-					cpConfigurationListId, cpInstance));
+					cpConfigurationList.getCPConfigurationListId(),
+					cpInstance));
 
 			commerceOrderImporterItemImpl.setUnitOfMeasureKey(StringPool.BLANK);
 		}

modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnEditDisplayContext.java

@@ -681,7 +681,7 @@ private List<ObjectEntry> _getCommerceReturnItemObjectEntries()
 
 		return _objectEntryLocalService.getOneToManyObjectEntries(
 			objectEntry.getGroupId(),
-			objectRelationship.getObjectRelationshipId(), null,
+			objectRelationship.getObjectRelationshipId(), null, false,
 			objectEntry.getObjectEntryId(), true, null, QueryUtil.ALL_POS,
 			QueryUtil.ALL_POS, null);
 	}

modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPConfigurationListPanelApp.java

@@ -9,11 +9,7 @@
 import com.liferay.application.list.PanelApp;
 import com.liferay.commerce.application.list.constants.CommercePanelCategoryKeys;
 import com.liferay.commerce.product.constants.CPPortletKeys;
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
-import com.liferay.portal.kernel.model.Group;
 import com.liferay.portal.kernel.model.Portlet;
-import com.liferay.portal.kernel.security.permission.PermissionChecker;
 
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -40,18 +36,6 @@ public String getPortletId() {
 		return CPPortletKeys.CP_CONFIGURATION_LISTS;
 	}
 
-	@Override
-	public boolean isShow(PermissionChecker permissionChecker, Group group)
-		throws PortalException {
-
-		boolean show = super.isShow(permissionChecker, group);
-
-		show &= FeatureFlagManagerUtil.isEnabled(
-			group.getCompanyId(), "LPD-10889");
-
-		return show;
-	}
-
 	@Reference(
 		target = "(jakarta.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS + ")"
 	)