Skip to content
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

Jump to bottom

Don't use vanity import which was breaking external deps #332

Merged
merged 1 commit into from
Aug 25, 2023
Merged

Don't use vanity import which was breaking external deps #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/build_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"time"

"github.com/temporalio/features/harness/go/harness"
"github.com/urfave/cli/v2"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/log"
"golang.org/x/mod/semver"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/prepare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"

"github.com/temporalio/features/harness/go/harness"
"github.com/urfave/cli/v2"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/log"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (

"github.com/google/uuid"
"github.com/pmezard/go-difflib/difflib"
"github.com/temporalio/features/harness/go/cmd"
"github.com/temporalio/features/harness/go/harness"
"github.com/temporalio/features/harness/go/history"
"github.com/temporalio/features/harness/go/temporalite"
"github.com/temporalio/features/sdkbuild"
"github.com/urfave/cli/v2"
"go.temporal.io/features/harness/go/cmd"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/features/harness/go/history"
"go.temporal.io/features/harness/go/temporalite"
"go.temporal.io/features/sdkbuild"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/log"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/run_feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/fs"
"path/filepath"

"go.temporal.io/features/harness/go/cmd"
"github.com/temporalio/features/harness/go/cmd"
"golang.org/x/mod/semver"
)

Expand Down
16 changes: 8 additions & 8 deletions cmd/run_go.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"go.temporal.io/features/harness/go/cmd"
"go.temporal.io/features/sdkbuild"
"github.com/temporalio/features/harness/go/cmd"
"github.com/temporalio/features/sdkbuild"
)

// BuildGoProgram prepares a Go run without running it. The preparer config
Expand All @@ -21,18 +21,18 @@ func (p *Preparer) BuildGoProgram(ctx context.Context) (sdkbuild.Program, error)

go 1.17

require go.temporal.io/features/features v1.0.0
require go.temporal.io/features/harness/go v1.0.0
require github.com/temporalio/features/features v1.0.0
require github.com/temporalio/features/harness/go v1.0.0

replace go.temporal.io/features/features => ../features
replace go.temporal.io/features/harness/go => ../harness/go
replace github.com/temporalio/features/features => ../features
replace github.com/temporalio/features/harness/go => ../harness/go

replace github.com/cactus/go-statsd-client => github.com/cactus/go-statsd-client v3.2.1+incompatible`,
GoMainContents: `package main

import (
"go.temporal.io/features/harness/go/cmd"
_ "go.temporal.io/features/features"
"github.com/temporalio/features/harness/go/cmd"
_ "github.com/temporalio/features/features"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/run_java.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"path/filepath"

"go.temporal.io/features/harness/go/cmd"
"go.temporal.io/features/sdkbuild"
"github.com/temporalio/features/harness/go/cmd"
"github.com/temporalio/features/sdkbuild"
)

// BuildJavaProgram prepares a Java run without running it. The preparer config
Expand Down
4 changes: 2 additions & 2 deletions cmd/run_python.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"

"go.temporal.io/features/harness/go/cmd"
"go.temporal.io/features/sdkbuild"
"github.com/temporalio/features/harness/go/cmd"
"github.com/temporalio/features/sdkbuild"
)

// PreparePythonExternal prepares a Python run without running it. The preparer
Expand Down
4 changes: 2 additions & 2 deletions cmd/run_typescript.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"path/filepath"

"go.temporal.io/features/harness/go/cmd"
"go.temporal.io/features/sdkbuild"
"github.com/temporalio/features/harness/go/cmd"
"github.com/temporalio/features/sdkbuild"
)

// BuildTypeScriptProgram prepares a TypeScript run without running it. The
Expand Down
2 changes: 1 addition & 1 deletion features/activity/cancel_try_cancel/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/activity"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/temporal"
Expand Down
2 changes: 1 addition & 1 deletion features/activity/retry_on_error/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/activity"
"go.temporal.io/sdk/temporal"
"go.temporal.io/sdk/workflow"
Expand Down
4 changes: 2 additions & 2 deletions features/bugs/go/activity_start_race/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"sync"
"time"

"go.temporal.io/features/harness/go/harness"
"go.temporal.io/features/harness/go/history"
"github.com/temporalio/features/harness/go/harness"
"github.com/temporalio/features/harness/go/history"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/workflow"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion features/bugs/go/activity_start_race/feature_pre1.12.0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package activity_start_race

import (
"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/harness/go/harness"
)

var Feature = harness.Feature{
Expand Down
2 changes: 1 addition & 1 deletion features/bugs/go/child_workflow_cancel_panic/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/temporal"
"go.temporal.io/sdk/workflow"
Expand Down
4 changes: 2 additions & 2 deletions features/build_id_versioning/activity_and_child_on_correct_version/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"time"

"go.temporal.io/features/features/build_id_versioning"
"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/features/build_id_versioning"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/activity"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/temporal"
Expand Down
2 changes: 1 addition & 1 deletion features/build_id_versioning/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"time"

"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/api/workflowservice/v1"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/client"
)

Expand Down
4 changes: 2 additions & 2 deletions features/build_id_versioning/continues_as_new_on_correct_version/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"time"

"go.temporal.io/features/features/build_id_versioning"
"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/features/build_id_versioning"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/temporal"
"go.temporal.io/sdk/worker"
Expand Down
4 changes: 2 additions & 2 deletions features/build_id_versioning/only_appropriate_worker_gets_task/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"time"

"go.temporal.io/features/features/build_id_versioning"
"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/features/build_id_versioning"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/worker"
"go.temporal.io/sdk/workflow"
Expand Down
4 changes: 2 additions & 2 deletions features/build_id_versioning/unversioned_worker_gets_unversioned_task/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"go.temporal.io/features/features/build_id_versioning"
"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/features/build_id_versioning"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/workflow"
)
Expand Down
4 changes: 2 additions & 2 deletions features/build_id_versioning/unversioned_worker_no_task/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"time"

"go.temporal.io/features/features/build_id_versioning"
"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/features/build_id_versioning"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/workflow"
)
Expand Down
4 changes: 2 additions & 2 deletions features/build_id_versioning/versions_added_while_worker_polling/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"time"

"go.temporal.io/features/features/build_id_versioning"
"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/features/build_id_versioning"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/worker"
"go.temporal.io/sdk/workflow"
Expand Down
2 changes: 1 addition & 1 deletion features/child_workflow/result/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package result
import (
"time"

"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/workflow"
)

Expand Down
2 changes: 1 addition & 1 deletion features/child_workflow/signal/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/workflow"
)
Expand Down
2 changes: 1 addition & 1 deletion features/continue_as_new/continue_as_same/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/converter"
"go.temporal.io/sdk/workflow"
Expand Down
2 changes: 1 addition & 1 deletion features/data_converter/binary/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"path/filepath"

"github.com/gogo/protobuf/jsonpb"
"github.com/temporalio/features/harness/go/harness"
common "go.temporal.io/api/common/v1"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/workflow"
)
Expand Down
2 changes: 1 addition & 1 deletion features/data_converter/binary_protobuf/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

"github.com/gogo/protobuf/proto"
"github.com/temporalio/features/harness/go/harness"
commonpb "go.temporal.io/api/common/v1"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/converter"
"go.temporal.io/sdk/workflow"
Expand Down
2 changes: 1 addition & 1 deletion features/data_converter/codec/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"encoding/json"

"github.com/gogo/protobuf/proto"
"github.com/temporalio/features/harness/go/harness"
commonpb "go.temporal.io/api/common/v1"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/converter"
"go.temporal.io/sdk/workflow"
Expand Down
2 changes: 1 addition & 1 deletion features/data_converter/empty/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"time"

"github.com/gogo/protobuf/jsonpb"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/api/common/v1"
historyProto "go.temporal.io/api/history/v1"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/temporal"
"go.temporal.io/sdk/workflow"
Expand Down
2 changes: 1 addition & 1 deletion features/data_converter/failure/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/json"
"errors"

"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/api/failure/v1"
historyProto "go.temporal.io/api/history/v1"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/temporal"
"go.temporal.io/sdk/workflow"
Expand Down
2 changes: 1 addition & 1 deletion features/data_converter/json/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"

"github.com/gogo/protobuf/proto"
"go.temporal.io/features/harness/go/harness"
"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/workflow"
)
Expand Down
2 changes: 1 addition & 1 deletion features/data_converter/json_protobuf/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/gogo/protobuf/jsonpb"
"github.com/gogo/protobuf/proto"
"github.com/temporalio/features/harness/go/harness"
commonpb "go.temporal.io/api/common/v1"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/client"
"go.temporal.io/sdk/workflow"
)
Expand Down
2 changes: 1 addition & 1 deletion features/eager_activity/non_remote_activities_worker/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"time"

"github.com/temporalio/features/harness/go/harness"
"go.temporal.io/api/enums/v1"
"go.temporal.io/features/harness/go/harness"
"go.temporal.io/sdk/temporal"
"go.temporal.io/sdk/worker"
"go.temporal.io/sdk/workflow"
Expand Down
Loading
Loading