Skip to content

improvement: Remove unused publisherFactory #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

improvement: Remove unused publisherFactory #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57ef30a
improvement: Remove unused publisherFactory
bmoylan Jun 7, 2024
c2d14c9
Add generated changelog entries
svc-changelog Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-474.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type: improvement
improvement:
description: Remove unused publisherFactory
links:
- https://github.com/palantir/distgo/pull/474
9 changes: 4 additions & 5 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package cmd

import (
"io/ioutil"
"os"
"time"

Expand Down Expand Up @@ -158,7 +157,7 @@ func init() {
}

func distgoProjectParamFromFlags() (distgo.ProjectInfo, distgo.ProjectParam, error) {
return distgoProjectParamFromVals(projectDirFlagVal, distgoConfigFileFlagVal, godelConfigFileFlagVal, cliProjectVersionerFactory, cliDisterFactory, cliDefaultDisterCfg, cliDockerBuilderFactory, cliPublisherFactory)
return distgoProjectParamFromVals(projectDirFlagVal, distgoConfigFileFlagVal, godelConfigFileFlagVal, cliProjectVersionerFactory, cliDisterFactory, cliDefaultDisterCfg, cliDockerBuilderFactory)
}

func distgoConfigModTime() *time.Time {
Expand All @@ -173,7 +172,7 @@ func distgoConfigModTime() *time.Time {
return &modTime
}

func distgoProjectParamFromVals(projectDir, distgoConfigFile, godelConfigFile string, projectVersionerFactory distgo.ProjectVersionerFactory, disterFactory distgo.DisterFactory, defaultDisterCfg config.DisterConfig, dockerBuilderFactory distgo.DockerBuilderFactory, publisherFactory distgo.PublisherFactory) (distgo.ProjectInfo, distgo.ProjectParam, error) {
func distgoProjectParamFromVals(projectDir, distgoConfigFile, godelConfigFile string, projectVersionerFactory distgo.ProjectVersionerFactory, disterFactory distgo.DisterFactory, defaultDisterCfg config.DisterConfig, dockerBuilderFactory distgo.DockerBuilderFactory) (distgo.ProjectInfo, distgo.ProjectParam, error) {
var distgoCfg config.ProjectConfig
if distgoConfigFile != "" {
cfg, err := loadConfigFromFile(distgoConfigFile)
Expand All @@ -189,7 +188,7 @@ func distgoProjectParamFromVals(projectDir, distgoConfigFile, godelConfigFile st
}
distgoCfg.Exclude.Add(excludes)
}
projectParam, err := distgoCfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory, publisherFactory)
projectParam, err := distgoCfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory)
if err != nil {
return distgo.ProjectInfo{}, distgo.ProjectParam{}, err
}
Expand All @@ -201,7 +200,7 @@ func distgoProjectParamFromVals(projectDir, distgoConfigFile, godelConfigFile st
}

func loadConfigFromFile(cfgFile string) (config.ProjectConfig, error) {
cfgBytes, err := ioutil.ReadFile(cfgFile)
cfgBytes, err := os.ReadFile(cfgFile)
if os.IsNotExist(err) {
return config.ProjectConfig{}, nil
}
Expand Down
9 changes: 2 additions & 7 deletions distgo/artifacts/artifacts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import (
"github.com/palantir/distgo/dockerbuilder/dockerbuilderfactory"
"github.com/palantir/distgo/internal/files"
"github.com/palantir/distgo/projectversioner/projectversionerfactory"
"github.com/palantir/distgo/publisher/publisherfactory"
"github.com/palantir/godel/v2/pkg/osarch"
"github.com/palantir/pkg/gittest"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -510,10 +509,8 @@ func TestPrintDockerArtifacts(t *testing.T) {
require.NoError(t, err)
dockerBuilderFactory, err := dockerbuilderfactory.New(nil, nil)
require.NoError(t, err)
publisherFactory, err := publisherfactory.New(nil, nil)
require.NoError(t, err)

projectParam, err := cfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory, publisherFactory)
projectParam, err := cfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory)
require.NoError(t, err)

projectInfo, err := projectParam.ProjectInfo(projectDir)
Expand Down Expand Up @@ -619,10 +616,8 @@ func TestDockerArtifacts(t *testing.T) {
require.NoError(t, err, "Case %d: %s", i, tc.name)
dockerBuilderFactory, err := dockerbuilderfactory.New(nil, nil)
require.NoError(t, err, "Case %d: %s", i, tc.name)
publisherFactory, err := publisherfactory.New(nil, nil)
require.NoError(t, err, "Case %d: %s", i, tc.name)

projectParam, err := tc.cfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory, publisherFactory)
projectParam, err := tc.cfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory)
require.NoError(t, err, "Case %d: %s", i, tc.name)

projectInfo, err := projectParam.ProjectInfo(projectDir)
Expand Down
2 changes: 1 addition & 1 deletion distgo/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (cfg *ProjectConfig) ToParam(
disterFactory distgo.DisterFactory,
defaultDisterCfg DisterConfig,
dockerBuilderFactory distgo.DockerBuilderFactory,
publisherFactory distgo.PublisherFactory) (distgo.ProjectParam, error) {
) (distgo.ProjectParam, error) {

var exclude matcher.Matcher
if !cfg.Exclude.Empty() {
Expand Down
5 changes: 1 addition & 4 deletions distgo/docker/docker_build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import (
"github.com/palantir/distgo/dockerbuilder"
"github.com/palantir/distgo/dockerbuilder/dockerbuilderfactory"
"github.com/palantir/distgo/projectversioner/projectversionerfactory"
"github.com/palantir/distgo/publisher/publisherfactory"
"github.com/palantir/godel/v2/pkg/osarch"
"github.com/palantir/pkg/gittest"
"github.com/pkg/errors"
Expand Down Expand Up @@ -778,10 +777,8 @@ RUN echo 'Tags for foo: {{Tags "foo" "print-dockerfile"}}'
require.NoError(t, err, "Case %d: %s", i, tc.name)
dockerBuilderFactory, err := dockerbuilderfactory.New([]dockerbuilder.Creator{dockerbuilder.NewCreator(printDockerfileDockerBuilderTypeName, newPrintDockerfileBuilder)}, nil)
require.NoError(t, err, "Case %d: %s", i, tc.name)
publisherFactory, err := publisherfactory.New(nil, nil)
require.NoError(t, err, "Case %d: %s", i, tc.name)

projectParam, err := tc.projectCfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory, publisherFactory)
projectParam, err := tc.projectCfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory)
require.NoError(t, err, "Case %d: %s", i, tc.name)

projectInfo, err := projectParam.ProjectInfo(projectDir)
Expand Down
5 changes: 1 addition & 4 deletions distgo/docker/docker_push_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"github.com/palantir/distgo/dockerbuilder"
"github.com/palantir/distgo/dockerbuilder/dockerbuilderfactory"
"github.com/palantir/distgo/projectversioner/projectversionerfactory"
"github.com/palantir/distgo/publisher/publisherfactory"
"github.com/palantir/pkg/gittest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -308,10 +307,8 @@ func TestDockerPublish(t *testing.T) {
require.NoError(t, err, "Case %d: %s", i, tc.name)
dockerBuilderFactory, err := dockerbuilderfactory.New([]dockerbuilder.Creator{dockerbuilder.NewCreator(printDockerfileDockerBuilderTypeName, newPrintDockerfileBuilder)}, nil)
require.NoError(t, err, "Case %d: %s", i, tc.name)
publisherFactory, err := publisherfactory.New(nil, nil)
require.NoError(t, err, "Case %d: %s", i, tc.name)

projectParam, err := tc.projectCfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory, publisherFactory)
projectParam, err := tc.projectCfg.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory)
require.NoError(t, err, "Case %d: %s", i, tc.name)

projectInfo, err := projectParam.ProjectInfo(projectDir)
Expand Down
9 changes: 2 additions & 7 deletions distgo/testfuncs/newprojectparam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/palantir/distgo/distgo/config"
"github.com/palantir/distgo/dockerbuilder/dockerbuilderfactory"
"github.com/palantir/distgo/projectversioner/projectversionerfactory"
"github.com/palantir/distgo/publisher/publisherfactory"
"github.com/stretchr/testify/require"
)

Expand All @@ -35,10 +34,8 @@ func NewProjectParam(t *testing.T, projectConfig config.ProjectConfig, projectDi
require.NoError(t, err, failMsg)
dockerBuilderFactory, err := dockerbuilderfactory.New(nil, nil)
require.NoError(t, err, failMsg)
publisherFactory, err := publisherfactory.New(nil, nil)
require.NoError(t, err, failMsg)

projectParam, err := projectConfig.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory, publisherFactory)
projectParam, err := projectConfig.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory)
require.NoError(t, err, failMsg)
return projectParam
}
Expand All @@ -52,8 +49,6 @@ func NewProjectParamReturnError(t *testing.T, projectConfig config.ProjectConfig
require.NoError(t, err, failMsg)
dockerBuilderFactory, err := dockerbuilderfactory.New(nil, nil)
require.NoError(t, err, failMsg)
publisherFactory, err := publisherfactory.New(nil, nil)
require.NoError(t, err, failMsg)

return projectConfig.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory, publisherFactory)
return projectConfig.ToParam(projectDir, projectVersionerFactory, disterFactory, defaultDisterCfg, dockerBuilderFactory)
}