definition: Filter LXC targets

Signed-off-by: Thomas Hipp <thomas.hipp@canonical.com>

shared/definition.go

@@ -171,10 +171,11 @@ type DefinitionSource struct {
 
 // A DefinitionTargetLXCConfig represents the config part of the metadata.
 type DefinitionTargetLXCConfig struct {
-	Type    string `yaml:"type"`
-	Before  uint   `yaml:"before,omitempty"`
-	After   uint   `yaml:"after,omitempty"`
-	Content string `yaml:"content"`
+	DefinitionFilter `yaml:",inline"`
+	Type             string `yaml:"type"`
+	Before           uint   `yaml:"before,omitempty"`
+	After            uint   `yaml:"after,omitempty"`
+	Content          string `yaml:"content"`
 }
 
 // A DefinitionTargetLXC represents LXC specific files as part of the metadata.
@@ -692,6 +693,20 @@ func (d *Definition) ApplyFilters(imageTargets ImageTarget) {
 		newDefinition.Actions = append(newDefinition.Actions, action)
 	}
 
+	// Filter targets
+	newDefinition.Targets.LXC.Config = []DefinitionTargetLXCConfig{}
+
+	for _, config := range d.Targets.LXC.Config {
+		// Always add ImageTargetUndefined when handling LXC targets.
+		// These are only applied when running {build,pack}-lxc, and shouldn't require
+		// explicitly setting the "container" type filter.
+		if !d.applyFilter(&config, ImageTargetUndefined|imageTargets) {
+			continue
+		}
+
+		newDefinition.Targets.LXC.Config = append(newDefinition.Targets.LXC.Config, config)
+	}
+
 	*d = newDefinition
 }
 

shared/definition_test.go

@@ -577,6 +577,42 @@ func TestApplyFilter(t *testing.T) {
 	require.True(t, d.applyFilter(&repo, ImageTargetAll|ImageTargetContainer))
 	require.True(t, d.applyFilter(&repo, ImageTargetContainer|ImageTargetVM))
 	require.False(t, d.applyFilter(&repo, ImageTargetContainer))
+
+	// Simulate build-lxc
+	d = Definition{
+		Targets: DefinitionTarget{
+			LXC: DefinitionTargetLXC{
+				Config: []DefinitionTargetLXCConfig{
+					{
+						Type:    "all",
+						Before:  5,
+						Content: "lxc.include = LXC_TEMPLATE_CONFIG/distro.common.conf",
+					},
+				},
+			},
+		},
+	}
+
+	d.ApplyFilters(ImageTargetUndefined | ImageTargetAll | ImageTargetContainer)
+	require.NotEmpty(t, d.Targets.LXC.Config)
+
+	// Simulate pack-lxc
+	d = Definition{
+		Targets: DefinitionTarget{
+			LXC: DefinitionTargetLXC{
+				Config: []DefinitionTargetLXCConfig{
+					{
+						Type:    "all",
+						Before:  5,
+						Content: "lxc.include = LXC_TEMPLATE_CONFIG/distro.common.conf",
+					},
+				},
+			},
+		},
+	}
+
+	d.ApplyFilters(ImageTargetAll | ImageTargetContainer)
+	require.NotEmpty(t, d.Targets.LXC.Config)
 }
 
 func TestDefinitionFilterTypeUnmarshalYAML(t *testing.T) {