• Refactor composer.json
CommentFileSizeAuthor
#13 3163418-13-hotfix.patch410 bytesyas
#6 intediff-3163418-6.txt390 bytesyas
#6 3163418-6.patch2.48 KByas
#5 3163418-for-testing-only.patch2.44 KBbaldwinlouie
#2 3163418-2.patch2.47 KByas
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

yas created an issue. See original summary.

yas’s picture

yas
🇯🇵 he/him
Primary language Japanese
Location California 🇺🇸
CreditAttribution: yas at DOCOMO Innovations, Inc. commented
Status: Needs work » Needs review
FileSize
3163418-2.patch2.47 KB
yas’s picture

yas
🇯🇵 he/him
Primary language Japanese
Location California 🇺🇸
CreditAttribution: yas at DOCOMO Innovations, Inc. commented
Related issues: +#3158445: Composer require failure due to "Failed to execute git clone" in drupalci/php-7.4-apache, +#3157542: Error when having a composer.json dependency on a non-ready D9 module, +#3157104: Support Geocoder module 3.x in composer.json
baldwinlouie’s picture

baldwinlouie CreditAttribution: baldwinlouie commented

@yas, the changes look good. I was able to verify that maclof/kubernetes/client was picked up!

FYI, I *think* I run into the same problem as Drupal CI/CD. For example, I wanted to use your latest composer.json changes in Cloud Orchestrator. The best I can do is apply your patch here. However, the patch is applied after composer install is ran. Thus the changes are never picked up.

My work around was to run a local repository of the cloud module by adding changing the "name": "drupal_local/local_cloud", in cloud's composer.json. I can then apply this patch to it.

Then in my Cloud Orchestrator's composer.json, instead of requiring drupal/cloud, I require drupal_local/local_cloud, which contains the patched composer.json. I also added a local repository by adding 


 "local" : {
            "type": "path",
            "url": "/Users/baldwin/Devel/Docomo/cloud"
        }

Only then was I able to build Cloud Orchestrator and have it pick up your patched change.

I do have the following comment.

+++ b/composer.json
@@ -1,16 +1,42 @@
+    "drupal/bootstrap_cloud": "*",

Do we want to tie it to a branch/tag or move this to "require-dev"?

The reason is that I can foresee conflicts in the future if I ever want to tie "Cloud Orchestrator" to a specific version of bootstrap_Cloud

baldwinlouie’s picture

baldwinlouie CreditAttribution: baldwinlouie commented
FileSize
3163418-for-testing-only.patch2.44 KB

Trying a test patch. NOT TO BE checked in yet.

yas’s picture

yas
🇯🇵 he/him
Primary language Japanese
Location California 🇺🇸
CreditAttribution: yas at DOCOMO Innovations, Inc. commented
FileSize
3163418-6.patch2.48 KB
intediff-3163418-6.txt390 bytes

@baldwinlouie

Thank you for your comment and test. I updated the patch; so could you please review it?

baldwinlouie’s picture

baldwinlouie CreditAttribution: baldwinlouie commented
Status: Needs review » Reviewed & tested by the community

@yas, thank you for the updated patch. This looks good!

yas’s picture

yas
🇯🇵 he/him
Primary language Japanese
Location California 🇺🇸
CreditAttribution: yas at DOCOMO Innovations, Inc. commented

@baldwinlouie

Thank you for your review. Let's try to merge the patch to 8.x-1.x, 8.x-2.x and 3.x!

  • yas committed 2e1305e on 8.x-1.x 
    Issue #3163418 by yas, baldwinlouie: Refactor composer.json

  • yas committed 178546d on 8.x-2.x 
    Issue #3163418 by yas, baldwinlouie: Refactor composer.json

  • yas committed 44f73c9 on 3.x 
    Issue #3163418 by yas, baldwinlouie: Refactor composer.json
yas’s picture

yas
🇯🇵 he/him
Primary language Japanese
Location California 🇺🇸
CreditAttribution: yas at DOCOMO Innovations, Inc. commented
Status: Reviewed & tested by the community » Fixed
yas’s picture

yas
🇯🇵 he/him
Primary language Japanese
Location California 🇺🇸
CreditAttribution: yas at DOCOMO Innovations, Inc. commented
Status: Fixed » Needs review
FileSize
3163418-13-hotfix.patch410 bytes

Fixing a bug:

+++ b/composer.json
@@ -17,7 +17,7 @@
-    "drupal/cloud:3.x-dev": "*",
+    "drupal/cloud": "3.x-dev",

  • yas committed 2ddc344 on 8.x-1.x 
    Issue #3163418 by yas, baldwinlouie: Hotfix - Refactor composer.json

  • yas committed 4a5045c on 8.x-2.x 
    Issue #3163418 by yas, baldwinlouie: Hotfix - Refactor composer.json

  • yas committed b874ffb on 3.x 
    Issue #3163418 by yas, baldwinlouie: Hotfix - Refactor composer.json
yas’s picture

yas
🇯🇵 he/him
Primary language Japanese
Location California 🇺🇸
CreditAttribution: yas at DOCOMO Innovations, Inc. commented
Status: Needs review » Fixed

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.