Issue #3323864 by yas, sekinet, baldwinlouie, Masami, Ryo Yamashita, Xiaohua... (4c82502f) · Commits · project / cloud

cloud.libraries.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ d3-horizon-chart:
		version: 4.x
		license:
		name: Apache License, Version 2.0
		url: http://www.apache.org/licenses/LICENSE-2.0
		url: https://www.apache.org/licenses/LICENSE-2.0
		gpl-compatible: false
		js:
		https://unpkg.com/@docomoinnovations/horizon-chart@1.1.0/dist/d3-horizon-chart.js: { type: external, minified: true }

cloud.module

+1 −1

Original line number	Diff line number	Diff line
		@@ -278,7 +278,7 @@ function cloud_preprocess_page(array &$variables): void {
		$route = \Drupal::routeMatch()->getRouteObject();
		if ($route) {
		$view_id = $route->getDefault('view_id');
		if ($view_id && $view_id === 'cloud_config') {
		if ($view_id === 'cloud_config') {
		$block_manager = \Drupal::service('plugin.manager.block');
		$config = ['not_display_cloud_config_page' => TRUE];
		$plugin_block = $block_manager->createInstance('cloud_config_location', $config);

deployments/docker/Dockerfile

+5 −6

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ RUN set -eux; \
		if command -v a2enmod; then \
		a2enmod rewrite; \
		fi; \

		savedAptMark="$(apt-mark showmanual)"

		RUN set -eux; \
		@@ -29,24 +28,24 @@ RUN set -eux; \
		git clone https://github.com/krakjoe/apcu /usr/src/php/ext/apcu \
		&& cd /usr/src/php/ext/apcu \
		&& docker-php-ext-install apcu > /dev/null 2>&1; \

		\
		# Install OpCache.
		docker-php-ext-install -j "$(nproc)" opcache > /dev/null 2>&1; \

		\
		# Install uploadprogress.
		pecl install uploadprogress > /dev/null 2>&1 \
		&& docker-php-ext-enable uploadprogress > /dev/null 2>&1; \

		\
		# Install Memcached.
		git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
		&& cd /usr/src/php/ext/memcached \
		&& docker-php-ext-install memcached > /dev/null 2>&1; \

		\
		# Install graphic libraries and etc.
		docker-php-ext-configure gd \
		--with-freetype \
		--with-jpeg > /dev/null 2>&1; \

		\
		docker-php-ext-install -j "$(nproc)" \
		gd \
		pdo_mysql \

modules/cloud_budget/cloud_budget.module

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ function cloud_budget_delete_cloud_credit_user_callback(array $entities, array $

		// Inform the batch engine that we are not finished,
		// and provide an estimation of the completion level we reached.
		if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
		if ($context['sandbox']['progress'] !== $context['sandbox']['max']) {
		$context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
		}

modules/cloud_service_providers/aws_cloud/aws_cloud.module

+9 −8

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ use Drupal\Core\Ajax\ReplaceCommand;
		use Drupal\Core\Cache\Cache;
		use Drupal\Core\Database\Query\AlterableInterface;
		use Drupal\Core\Database\Query\Condition;
		use Drupal\Core\Database\Query\SelectInterface;
		use Drupal\Core\Datetime\DrupalDateTime;
		use Drupal\Core\Entity\ContentEntityInterface;
		use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
		@@ -575,7 +576,7 @@ function aws_cloud_reassign_entity_uid_callback(array $entities, array $updates,

		// Inform the batch engine that we are not finished,
		// and provide an estimation of the completion level we reached.
		if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
		if ($context['sandbox']['progress'] !== $context['sandbox']['max']) {
		$context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
		}
		}
		@@ -857,7 +858,7 @@ function aws_cloud_cloud_configs_equal(
		// Because some fields of $cloud_config1 and $cloud_config2,
		// such as revision_created, have different types,
		// we have to use != instead of !== to compare them.
		if ($cloud_config1->get($field_name)->value != $cloud_config2->get($field_name)->value) {
		if ($cloud_config1->get($field_name)->value !== $cloud_config2->get($field_name)->value) {
		return FALSE;
		}
		}
		@@ -1944,9 +1945,7 @@ function aws_cloud_form_cloud_launch_template_aws_cloud_approve_form_submit(arra
		}
		else {
		\Drupal::service('cloud')->processOperationErrorStatus($server_template, 'approved');
		return;
		}

		}

		/**
		@@ -2006,7 +2005,6 @@ function aws_cloud_form_cloud_launch_template_aws_cloud_review_form_submit(array
		}
		else {
		\Drupal::service('cloud')->processOperationErrorStatus($server_template, 'review');
		return;
		}
		}

		@@ -2474,6 +2472,8 @@ function aws_cloud_launch_template_edit_is_changed(CloudLaunchTemplate $server_t
		$field_value = $server_template->get($field)->value;
		$storage_value = $template_storage->get($field)->value;
		}

		// DO NOT change to `!==` from `!=`. Keep as it is.
		if ($field_value != $storage_value) {
		return TRUE;
		}
		@@ -4998,7 +4998,7 @@ function _aws_cloud_get_cloud_context_by_region($region) {
		'field_region' => $region,
		]
		);
		if (count($cloud_configs) == 1) {
		if (count($cloud_configs) === 1) {
		$cloud_config = array_shift($cloud_configs);
		}
		return $cloud_config;
		@@ -5191,7 +5191,7 @@ function aws_cloud_form_alter(array &$form, FormStateInterface $form_state, $for
		$form['#submit'][] = 'cloud_views_bulk_form_submit';
		}

		if ($form['#id'] == 'views-exposed-form-aws-cloud-image-list') {
		if ($form['#id'] === 'views-exposed-form-aws-cloud-image-list') {
		$form['visibility']['#options'][1] = t('Public');
		$form['visibility']['#options'][0] = t('Private');
		}
		@@ -5571,9 +5571,11 @@ function aws_cloud_query_all_aws_cloud_resource_views_access_alter(AlterableInte
		// NOTE: $alias is unused variable.
		foreach ($query_tables ?: [] as $info) {
		if ($info['table'] instanceof SelectInterface) {
		// @FIXME The single `continue` statement doesn't make sense below.
		continue;
		}
		}
		// @FIXME $info is not defined.
		$table_name = $info['table'];

		if (!$account = $query->getMetaData('account')) {
		@@ -5786,7 +5788,6 @@ function aws_cloud_ajax_callback_get_instance_types(array $form, FormStateInterf

		if (!in_array($architecture, $architectures)) {
		unset($options[$type]);
		continue;
		}
		}