Skip to content

Commit

Permalink
Honor build_tags in config (#11156)
Browse files Browse the repository at this point in the history
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

<!-- Issue number if applicable -->
#### Link to tracking issue
Fixes #

<!--Describe what testing was performed and which tests were added.-->
#### Testing

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->
  • Loading branch information
newly12 committed Sep 19, 2024
1 parent 6fab8ae commit 396ae85
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 0 deletions.
20 changes: 20 additions & 0 deletions .chloggen/fixbuildtags.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: 'bug_fix'

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: builder

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Honor build_tags in config

# One or more tracking issues or pull requests related to the change
issues: [11156]

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
13 changes: 13 additions & 0 deletions cmd/builder/internal/builder/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ func TestNewDefaultConfig(t *testing.T) {
assert.NoError(t, cfg.SetGoPath())
require.NoError(t, cfg.Validate())
assert.False(t, cfg.Distribution.DebugCompilation)
assert.Empty(t, cfg.Distribution.BuildTags)
}

func TestNewBuiltinConfig(t *testing.T) {
Expand Down Expand Up @@ -198,6 +199,18 @@ func TestSkipGoInitialization(t *testing.T) {
assert.Zero(t, cfg.Distribution.Go)
}

func TestBuildTagConfig(t *testing.T) {
cfg := Config{
Distribution: Distribution{
BuildTags: "customTag",
},
SkipCompilation: true,
SkipGetModules: true,
}
require.NoError(t, cfg.Validate())
assert.Equal(t, "customTag", cfg.Distribution.BuildTags)
}

func TestDebugOptionSetConfig(t *testing.T) {
cfg := Config{
Distribution: Distribution{
Expand Down
12 changes: 12 additions & 0 deletions cmd/builder/internal/builder/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,18 @@ func TestGenerateAndCompile(t *testing.T) {
return cfg
},
},
{
name: "Build Tags Compilation",
cfgBuilder: func(t *testing.T) Config {
cfg := newTestConfig()
err := cfg.SetBackwardsCompatibility()
require.NoError(t, err)
cfg.Distribution.OutputPath = t.TempDir()
cfg.Replaces = append(cfg.Replaces, replaces...)
cfg.Distribution.BuildTags = "customTag"
return cfg
},
},
{
name: "Debug Compilation",
cfgBuilder: func(t *testing.T) Config {
Expand Down
1 change: 1 addition & 0 deletions cmd/builder/internal/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,5 +209,6 @@ func applyCfgFromFile(flags *flag.FlagSet, cfgFromFile builder.Config) {
if !flags.Changed(distributionModuleFlag) && cfgFromFile.Distribution.Module != "" {
cfg.Distribution.Module = cfgFromFile.Distribution.Module
}
cfg.Distribution.BuildTags = cfgFromFile.Distribution.BuildTags
cfg.Distribution.DebugCompilation = cfgFromFile.Distribution.DebugCompilation
}

0 comments on commit 396ae85

Please sign in to comment.