Closed (fixed)
Project:
Cloud
Version:
3.x-dev
Component:
Code
Priority:
Normal
Category:
Task
Assigned:
Reporter:
Created:
9 Feb 2021 at 07:42 UTC
Updated:
23 Feb 2021 at 21:29 UTC
Jump to comment: Most recent, Most recent file
Cloud server template to Cloud launch templateCreate 〜 to Add 〜cloud.permissions.yml| Comment | File | Size | Author |
|---|---|---|---|
| #3 | 3197433-3.patch | 124.47 KB | yas |
Start within a Git clone of the project using the version control instructions.
Or, if you do not have SSH keys set up on git.drupalcode.org:
Comments
Comment #3
yas@baldwinlouie
@masatotakada
@sekinet
Could you please review the patch?
Comment #4
sekinet commented@yas I’ve checked the patch and it looks good.
Comment #5
ilgnerfagundes commentedI tried to run the patch it presented the following errors
~/Documentos/projetos/ci-t-website/drupal/web/modules/custom/cloud$ git apply -v 3197433-3.patch
Checking patch cloud.install...
Checking patch cloud.links.menu.yml...
Checking patch cloud.links.task.yml...
Checking patch cloud.permissions.yml...
Checking patch cloud.routing.yml...
Checking patch cloud_server_template.page.inc...
Checking patch config/cloud_server_template.api.php...
Checking patch modules/cloud_service_providers/aws_cloud/aws_cloud.install...
Checking patch modules/cloud_service_providers/aws_cloud/aws_cloud.module...
Checking patch modules/cloud_service_providers/aws_cloud/src/Entity/Ec2/AwsCloudViewBuilder.php...
Checking patch modules/cloud_service_providers/aws_cloud/src/Form/Ec2/InstanceLaunchForm.php...
Checking patch modules/cloud_service_providers/aws_cloud/src/Plugin/Derivative/AwsCloudMenuLinks.php...
Checking patch modules/cloud_service_providers/aws_cloud/src/Plugin/Field/FieldFormatter/InstanceTypeLinkFormatter.php...
Checking patch modules/cloud_service_providers/aws_cloud/src/Plugin/Validation/Constraint/AWSConstraintValidator.php...
Checking patch modules/cloud_service_providers/aws_cloud/src/Plugin/cloud/server_template/AwsCloudServerTemplatePlugin.php...
error: while searching for:
}
/**
* Update instance name based on the name of the cloud server template.
*
* If the same instance name exists, the number suffix (#2, #3…) can be
* added at the end of the cloud server template name.
*
* @param \Drupal\cloud\Entity\CloudServerTemplateInterface $cloud_server_template
* The cloud server template used to launch a instance.
* @param string $cloud_launch_uuid
* The uuid to specify instances.
*/
error: patch failed: modules/cloud_service_providers/aws_cloud/src/Plugin/cloud/server_template/AwsCloudServerTemplatePlugin.php:542
error: modules/cloud_service_providers/aws_cloud/src/Plugin/cloud/server_template/AwsCloudServerTemplatePlugin.php: patch does not apply
Checking patch modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2BatchOperations.php...
Checking patch modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2ServiceInterface.php...
Checking patch modules/cloud_service_providers/aws_cloud/tests/src/Functional/Ec2/InstanceExtraTest.php...
Checking patch modules/cloud_service_providers/aws_cloud/tests/src/Functional/Ec2/InstanceTest.php...
Checking patch modules/cloud_service_providers/aws_cloud/tests/src/Functional/cloud/server_template/CloudServerTemplateTest.php...
Checking patch modules/cloud_service_providers/aws_cloud/tests/src/Traits/AwsCloudTestEntityTrait.php...
Checking patch modules/cloud_service_providers/aws_cloud/tests/src/Traits/AwsCloudTestFormDataTrait.php...
Checking patch modules/cloud_service_providers/k8s/k8s.install...
Checking patch modules/cloud_service_providers/k8s/k8s.module...
Checking patch modules/cloud_service_providers/k8s/src/Plugin/Validation/Constraint/YamlObjectSupportConstraint.php...
Checking patch modules/cloud_service_providers/k8s/src/Plugin/cloud/project/K8sCloudProjectPlugin.php...
Checking patch modules/cloud_service_providers/k8s/src/Plugin/cloud/server_template/K8sCloudServerTemplatePlugin.php...
Checking patch modules/cloud_service_providers/k8s/src/Service/K8sService.php...
Checking patch modules/cloud_service_providers/k8s/src/Service/K8sServiceInterface.php...
Checking patch modules/cloud_service_providers/k8s/tests/src/Functional/cloud/server_template/CloudServerTemplateTest.php...
Checking patch modules/cloud_service_providers/k8s/tests/src/Traits/K8sTestEntityTrait.php...
Checking patch modules/cloud_service_providers/k8s/tests/src/Traits/K8sTestFormDataTrait.php...
Checking patch modules/cloud_service_providers/openstack/openstack.module...
Checking patch modules/cloud_service_providers/openstack/src/Form/OpenStackInstanceLaunchForm.php...
Checking patch modules/cloud_service_providers/openstack/src/Plugin/Derivative/OpenStackMenuLinks.php...
Checking patch modules/cloud_service_providers/openstack/src/Plugin/cloud/server_template/OpenStackServerTemplatePlugin.php...
error: while searching for:
}
/**
* Update instance name based on the name of the cloud server template.
*
* If the same instance name exists, the number suffix (#2, #3…) can be
* added at the end of the cloud server template name.
*
* @param \Drupal\cloud\Entity\CloudServerTemplateInterface $cloud_server_template
* The cloud server template used to launch a instance.
* @param string $cloud_launch_uuid
* The uuid to specify instances.
*/
error: patch failed: modules/cloud_service_providers/openstack/src/Plugin/cloud/server_template/OpenStackServerTemplatePlugin.php:500
error: modules/cloud_service_providers/openstack/src/Plugin/cloud/server_template/OpenStackServerTemplatePlugin.php: patch does not apply
Checking patch modules/cloud_service_providers/openstack/tests/src/Functional/OpenStack/OpenStackInstanceExtraTest.php...
Checking patch modules/cloud_service_providers/openstack/tests/src/Functional/OpenStack/OpenStackInstanceTest.php...
Checking patch modules/cloud_service_providers/openstack/tests/src/Functional/cloud/server_template/CloudServerTemplateTest.php...
Checking patch modules/cloud_service_providers/openstack/tests/src/Traits/OpenStackTestEntityTrait.php...
Checking patch modules/cloud_service_providers/openstack/tests/src/Traits/OpenStackTestFormDataTrait.php...
Checking patch modules/cloud_service_providers/vmware/src/Plugin/cloud/server_template/VmwareCloudServerTemplatePlugin.php...
Checking patch modules/cloud_service_providers/vmware/tests/src/Functional/cloud/server_template/CloudServerTemplateTest.php...
Checking patch modules/cloud_service_providers/vmware/tests/src/Traits/VmwareTestFormDataTrait.php...
Checking patch modules/cloud_service_providers/vmware/vmware.install...
Checking patch modules/cloud_service_providers/vmware/vmware.module...
Checking patch modules/tools/k8s_to_s3/k8s_to_s3.module...
Checking patch src/Controller/CloudServerTemplateAccessControlHandler.php...
Checking patch src/Controller/CloudServerTemplateController.php...
Checking patch src/Controller/CloudServerTemplateListBuilder.php...
Checking patch src/Entity/CloudConfig.php...
Checking patch src/Entity/CloudProject.php...
Checking patch src/Entity/CloudServerTemplate.php...
Checking patch src/Entity/CloudServerTemplateInterface.php...
Checking patch src/Entity/CloudServerTemplateStorage.php...
Checking patch src/Entity/CloudServerTemplateStorageInterface.php...
Checking patch src/Entity/CloudServerTemplateType.php...
Checking patch src/Entity/CloudServerTemplateTypeInterface.php...
Checking patch src/Entity/CloudServerTemplateTypeListBuilder.php...
Checking patch src/Entity/CloudServerTemplateViewsData.php...
Checking patch src/Form/CloudServerTemplateApproveConfirm.php...
Checking patch src/Form/CloudServerTemplateCopyConfirm.php...
Checking patch src/Form/CloudServerTemplateDeleteForm.php...
Checking patch src/Form/CloudServerTemplateDeleteMultipleForm.php...
Checking patch src/Form/CloudServerTemplateForm.php...
Checking patch src/Form/CloudServerTemplateLaunchConfirm.php...
Checking patch src/Form/CloudServerTemplateProcessMultipleForm.php...
Checking patch src/Form/CloudServerTemplateReviewConfirm.php...
Checking patch src/Form/CloudServerTemplateRevisionDeleteForm.php...
Checking patch src/Form/CloudServerTemplateRevisionRevertForm.php...
Checking patch src/Form/CloudServerTemplateRevisionRevertTranslationForm.php...
Checking patch src/Form/CloudServerTemplateSettingsForm.php...
Checking patch src/Form/CloudStoreCopyConfirm.php...
Checking patch src/Plugin/Action/Config/DeleteCloudServerTemplate.php...
Checking patch src/Plugin/Derivative/CloudDesignMenuLinks.php...
Checking patch src/Plugin/Derivative/CloudServerTemplateCloudContextBundleDeriver.php...
Checking patch src/Plugin/cloud/config/CloudConfigPluginManagerInterface.php...
Checking patch src/Plugin/cloud/project/CloudProjectPluginManager.php...
Checking patch src/Plugin/cloud/server_template/CloudServerTemplatePluginInterface.php...
Checking patch src/Plugin/cloud/server_template/CloudServerTemplatePluginManager.php...
Checking patch src/Plugin/cloud/server_template/CloudServerTemplatePluginManagerInterface.php...
Checking patch src/Plugin/cloud/store/CloudStorePluginManagerInterface.php...
Checking patch src/Plugin/views/field/CloudServerTemplateListLink.php...
Checking patch src/Routing/CloudServerTemplateHtmlRouteProvider.php...
Checking patch src/Routing/CloudServerTemplateTypeHtmlRouteProvider.php...
Comment #6
yas@ilgnerfagundes
Thank you for trying to test the patch. I think I know the reason. I included the fixes for the multi-byte characters in the following comments:
https://git.drupalcode.org/search?utf8=%E2%9C%93&search=%E2%80%A6&group_...
With some reason, you downloaded and saved my patch with some inappropriate character encode. In my testing environment,
git applydid work:Two similar comments
* If the same instance name exists, the number suffix (#2, #3…)need to be like my screenshot:So could you please confirm the patch file's character encoding?
Comment #7
baldwinlouie commented@yas The patch looks good.
Comment #8
MasatoTakada commented@yas
It looks good to me.
Masato
Comment #9
yas@sekinet @baldwinlouie @masatotakada
Thank you for your review. I'll merge the patch to
3.xand close this issue asFixed.Comment #10
yas