Mailing-List: contact dev-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@brooklyn.apache.org
From: ahgittin <git@git.apache.org>
To: dev@brooklyn.apache.org
Reply-To: dev@brooklyn.apache.org
References: <git-pr-746-brooklyn-server@git.apache.org>
In-Reply-To: <git-pr-746-brooklyn-server@git.apache.org>
Subject: [GitHub] brooklyn-server pull request #746: Auto wrap YAML BOMs as catalog bundles
Content-Type: text/plain
Message-Id: <20170712081633.9CC47E9438@git1-us-west.apache.org>
Date: Wed, 12 Jul 2017 08:16:33 +0000 (UTC)
archived-at: Wed, 12 Jul 2017 08:16:35 -0000

Github user ahgittin commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/746#discussion_r126890746
  
    --- Diff: core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java ---
    @@ -472,12 +524,46 @@ private void collectCatalogItems(String yaml, List<CatalogItemDtoAbstract<?, ?>>
                     if (rootItemYaml.startsWith(match)) rootItemYaml = Strings.removeFromStart(rootItemYaml, match);
                     else rootItemYaml = Strings.replaceAllNonRegex(rootItemYaml, "\n"+match, "");
                 }
    -            collectCatalogItems("item:\n"+makeAsIndentedObject(rootItemYaml), rootItem, result, catalogMetadata);
    +            collectCatalogItemsFromItemMetadataBlock("item:\n"+makeAsIndentedObject(rootItemYaml), containingBundle, rootItem, result, requireValidation, catalogMetadata, 1, force);
             }
         }
     
    +    /**
    +     * Expects item metadata, containing an `item` containing the definition,
    +     * and/or `items` containing a list of item metadata (recursing with depth).
    +     * 
    +     * Supports two modes:
    --- End diff --
    
    added comment (it's actually `result` that controls the behaviour)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---