make method names a little less java-y (#6)

Author: ewhauser

.github/workflows/bazel-ci.yaml

@@ -35,15 +35,17 @@ jobs:
       - name: get-test-targets
         run: $(bazel info bazel-bin)/cli/bazel-differ_/bazel-differ get-targets -w $(pwd) -b $(which bazelisk) -s ${{ steps.get-revisions.outputs.previous_sha }} -f ${{ steps.get-revisions.outputs.current_sha }} -o test_targets.txt
       - name: run-test-targets
+        if: hashFiles('test_targets.txt') != ''
         run: |
           cat test_targets.txt
-          [[ -s test_targets.txt ]] && bazel test --target_pattern_file=test_targets.txt || echo "No targets to run."
+          bazel test --target_pattern_file=test_targets.txt
       - name: get-build-targets
         run: $(bazel info bazel-bin)/cli/bazel-differ_/bazel-differ get-targets -w $(pwd) -b $(which bazelisk) -s ${{ steps.get-revisions.outputs.previous_sha }} -f ${{ steps.get-revisions.outputs.current_sha }} -o build_targets.txt
       - name: run-build-targets
+        if: hashFiles('build_targets.txt') != ''
         run: |
           cat build_targets.txt
-          [[ -s build_targets.txt ]] && bazel build --target_pattern_file=build_targets.txt || echo "No targets to run."
+          bazel build --target_pattern_file=build_targets.txt || echo "No targets to run."
       # Run tests
       - name: gazelle check
         run: bazel run //:gazelle_ci

internal/bazel_client.go

@@ -105,18 +105,13 @@ func (b bazelClient) processBazelSourcefileTargets(targets []*Target,
 				workingDirectory = b.workingDirectory
 			}
 
-			var sourceFileTarget, err = NewBazelSourceFileTarget(
-				sourceFile.GetName(),
-				digest.Sum(nil),
-				b.filesystem,
-				workingDirectory,
-			)
+			var sourceFileTarget, err = NewBazelSourceFileTarget(sourceFile.GetName(), digest.Sum(nil), workingDirectory)
 
 			if err != nil {
 				return nil, err
 			}
 
-			sourceTargets[*sourceFileTarget.GetName()] = &sourceFileTarget
+			sourceTargets[*sourceFileTarget.Name()] = &sourceFileTarget
 		}
 	}
 	return sourceTargets, nil

internal/bazel_rule.go

@@ -25,16 +25,16 @@ func NewRuleProvider() RuleProvider {
 
 //go:generate mockgen -destination=../mocks/bazel_rule_mock.go -package=mocks github.com/ewhauser/bazel-differ/internal BazelRule
 type BazelRule interface {
-	GetDigest() ([]byte, error)
-	GetRuleInputList() []string
-	GetName() string
+	Digest() ([]byte, error)
+	RuleInputList() []string
+	Name() string
 }
 
 type bazelRule struct {
 	rule *Rule
 }
 
-func (b *bazelRule) GetDigest() ([]byte, error) {
+func (b *bazelRule) Digest() ([]byte, error) {
 	buffer := bytes.NewBuffer([]byte{})
 	if b.rule.RuleClass != nil {
 		if _, err := buffer.Write([]byte(*b.rule.RuleClass)); err != nil {
@@ -62,7 +62,7 @@ func (b *bazelRule) GetDigest() ([]byte, error) {
 	return checksum[:], nil
 }
 
-func (b *bazelRule) GetRuleInputList() []string {
+func (b *bazelRule) RuleInputList() []string {
 	var ruleInputList []string
 	for _, ruleInput := range b.rule.RuleInput {
 		if strings.HasPrefix(ruleInput, "@") {
@@ -81,10 +81,10 @@ func (b *bazelRule) GetRuleInputList() []string {
 	return ruleInputList
 }
 
-func (b *bazelRule) GetName() string {
+func (b *bazelRule) Name() string {
 	return b.rule.GetName()
 }
 
-func (b *bazelRule) GetRuleClass() string {
+func (b *bazelRule) RuleClass() string {
 	return b.rule.GetRuleClass()
 }

internal/bazel_sourcefile_target.go

@@ -4,26 +4,23 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"errors"
-	"io/fs"
 	"io/ioutil"
 	"os"
 	"path"
 	"strings"
 )
 
 type BazelSourceFileTarget interface {
-	GetName() *string
-	GetDigest() []byte
+	Name() *string
+	Digest() []byte
 }
 
 type bazelSourceFileTarget struct {
 	name   *string
 	digest []byte
 }
 
-func NewBazelSourceFileTarget(name string, digest []byte, filesystem fs.FS,
-	workingDirectory string) (BazelSourceFileTarget,
-	error) {
+func NewBazelSourceFileTarget(name string, digest []byte, workingDirectory string) (BazelSourceFileTarget, error) {
 	finalDigest := bytes.NewBuffer([]byte{})
 	if workingDirectory != "" && strings.HasPrefix(name, "//") {
 		filenameSubstring := name[2:]
@@ -47,10 +44,10 @@ func NewBazelSourceFileTarget(name string, digest []byte, filesystem fs.FS,
 	}, nil
 }
 
-func (b *bazelSourceFileTarget) GetName() *string {
+func (b *bazelSourceFileTarget) Name() *string {
 	return b.name
 }
 
-func (b *bazelSourceFileTarget) GetDigest() []byte {
+func (b *bazelSourceFileTarget) Digest() []byte {
 	return b.digest
 }

internal/target_hashing_client.go

@@ -189,12 +189,12 @@ func createDigestForRule(
 	bazelSourcefileTargets map[string]*BazelSourceFileTarget,
 	seedHash []byte,
 ) ([]byte, error) {
-	existingByteArray := ruleHashes[rule.GetName()]
+	existingByteArray := ruleHashes[rule.Name()]
 	if existingByteArray != nil {
 		return existingByteArray, nil
 	}
 	buffer := bytes.NewBuffer([]byte{})
-	ruleDigest, err := rule.GetDigest()
+	ruleDigest, err := rule.Digest()
 	if err != nil {
 		return nil, err
 	}
@@ -206,7 +206,7 @@ func createDigestForRule(
 			return nil, err
 		}
 	}
-	for _, ruleInput := range rule.GetRuleInputList() {
+	for _, ruleInput := range rule.RuleInputList() {
 		if _, err := buffer.Write([]byte(ruleInput)); err != nil {
 			return nil, err
 		}
@@ -216,7 +216,7 @@ func createDigestForRule(
 			return nil, err
 		}
 
-		if inputRule != nil && inputRule.GetName() != "" && !(inputRule.GetName() == rule.GetName()) {
+		if inputRule != nil && inputRule.Name() != "" && !(inputRule.Name() == rule.Name()) {
 			inputRuleHash, err := createDigestForRule(
 				inputRule,
 				allRulesMap,
@@ -240,7 +240,7 @@ func createDigestForRule(
 	}
 	checksum := sha256.Sum256(buffer.Bytes())
 	finalHashValue := checksum[:]
-	ruleHashes[rule.GetName()] = finalHashValue
+	ruleHashes[rule.Name()] = finalHashValue
 	return finalHashValue, nil
 }
 
@@ -262,7 +262,7 @@ func getDigestForSourceTargetName(sourceTargetName string, bazelSourcefileTarget
 	if !ok {
 		return nil, nil
 	}
-	return (*target).GetDigest(), nil
+	return (*target).Digest(), nil
 }
 
 func convertByteArrayToString(bytes []byte) string {

internal/target_hashing_client_test.go

@@ -206,9 +206,9 @@ func TestHashAllBazelTargets_generatedTargets(t *testing.T) {
 
 	ruleProvider.EXPECT().GetRule(NameMatcher("rule1")).DoAndReturn(func(*internal.Rule) internal.BazelRule {
 		rule := mocks.NewMockBazelRule(ctrl)
-		rule.EXPECT().GetName().Return("rule1").AnyTimes()
-		rule.EXPECT().GetRuleInputList().Return([]string{}).AnyTimes()
-		rule.EXPECT().GetDigest().Return([]byte("newDigest"), nil).AnyTimes()
+		rule.EXPECT().Name().Return("rule1").AnyTimes()
+		rule.EXPECT().RuleInputList().Return([]string{}).AnyTimes()
+		rule.EXPECT().Digest().Return([]byte("newDigest"), nil).AnyTimes()
 		return rule
 	})
 
@@ -254,9 +254,9 @@ func createRuleTarget(name string, inputs []string, digest string, ctrl *gomock.
 
 	provider.EXPECT().GetRule(NameMatcher(name)).DoAndReturn(func(*internal.Rule) internal.BazelRule {
 		rule := mocks.NewMockBazelRule(ctrl)
-		rule.EXPECT().GetName().Return(name).AnyTimes()
-		rule.EXPECT().GetRuleInputList().Return(inputs).AnyTimes()
-		rule.EXPECT().GetDigest().Return([]byte(digest), nil).AnyTimes()
+		rule.EXPECT().Name().Return(name).AnyTimes()
+		rule.EXPECT().RuleInputList().Return(inputs).AnyTimes()
+		rule.EXPECT().Digest().Return([]byte(digest), nil).AnyTimes()
 		return rule
 	}).AnyTimes()