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.

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

refac(pkg): rename optimizely to pkg #135

Merged
merged 2 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
before_script:
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.19.0
script:
- $GOPATH/bin/golangci-lint run --out-format=tab --tests=false optimizely/...
- $GOPATH/bin/golangci-lint run --out-format=tab --tests=false pkg/...
- stage: 'Integration Tests'
merge_mode: replace
env: SDK=go SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
cache: false
language: minimal
install: skip
before_script:
- mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://[email protected]/optimizely/travisci-tools.git && popd
- mkdir $HOME/travisci-tools && pushd $HOME/travisci-tools && git init && git pull https://[email protected]/pkg/travisci-tools.git && popd
script:
# TODO: Remove sohail/gosdkonly branch specification here, after
# we can run FSC tests on master: https://optimizely.atlassian.net/browse/OASIS-5425
Expand All @@ -39,7 +39,7 @@ jobs:
env: GIMME_GO_VERSION=1.8.x
before_script:
# GO module was not introduced earlier. need symlink to search in GOPATH
- mkdir -p $GOPATH/src/github.com && pushd $GOPATH/src/github.com && ln -s $HOME/build/optimizely optimizely && popd
- mkdir -p $GOPATH/src/github.com && pushd $GOPATH/src/github.com && ln -s $HOME/build/pkg pkg && popd
script:
# Need to download packages explicitly
- go get -v -d ./...
Expand Down
4 changes: 2 additions & 2 deletions cmd/get_enabled_features.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/get_feature_variable_boolean.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/get_feature_variable_double.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/get_feature_variable_integer.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/get_feature_variable_string.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/is_feature_enabled.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/track.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions examples/benchmark/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"os"
"path"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/decision"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/decision"
"github.com/optimizely/go-sdk/pkg/entities"

"github.com/pkg/profile"
)
Expand Down
8 changes: 4 additions & 4 deletions examples/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"fmt"
"time"

"github.com/optimizely/go-sdk/optimizely/client"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/optimizely/event"
"github.com/optimizely/go-sdk/optimizely/logging"
"github.com/optimizely/go-sdk/pkg/client"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/optimizely/go-sdk/pkg/event"
"github.com/optimizely/go-sdk/pkg/logging"
)

func main() {
Expand Down
16 changes: 8 additions & 8 deletions optimizely/client/client.go → pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ import (
"runtime/debug"
"strconv"

"github.com/optimizely/go-sdk/optimizely"
"github.com/optimizely/go-sdk/optimizely/decision"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/optimizely/event"
"github.com/optimizely/go-sdk/optimizely/logging"
"github.com/optimizely/go-sdk/optimizely/utils"
"github.com/optimizely/go-sdk/pkg"
"github.com/optimizely/go-sdk/pkg/decision"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/optimizely/go-sdk/pkg/event"
"github.com/optimizely/go-sdk/pkg/logging"
"github.com/optimizely/go-sdk/pkg/utils"
)

var logger = logging.GetLogger("Client")

// OptimizelyClient is the entry point to the Optimizely SDK
type OptimizelyClient struct {
ConfigManager optimizely.ProjectConfigManager
ConfigManager pkg.ProjectConfigManager
DecisionService decision.Service
EventProcessor event.Processor

Expand Down Expand Up @@ -416,7 +416,7 @@ func (o *OptimizelyClient) getExperimentDecision(experimentKey string, userConte
}

// GetProjectConfig returns the current ProjectConfig or nil if the instance is not valid
func (o *OptimizelyClient) GetProjectConfig() (projectConfig optimizely.ProjectConfig, err error) {
func (o *OptimizelyClient) GetProjectConfig() (projectConfig pkg.ProjectConfig, err error) {

projectConfig, err = o.ConfigManager.GetConfig()
if err != nil {
Expand Down
10 changes: 5 additions & 5 deletions optimizely/client/client_test.go → pkg/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"sync"
"testing"

"github.com/optimizely/go-sdk/optimizely"
"github.com/optimizely/go-sdk/optimizely/decision"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/optimizely/event"
"github.com/optimizely/go-sdk/pkg"
"github.com/optimizely/go-sdk/pkg/decision"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/optimizely/go-sdk/pkg/event"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down Expand Up @@ -66,7 +66,7 @@ func (f *MockProcessor) ProcessEvent(event event.UserEvent) {
}

type TestConfig struct {
optimizely.ProjectConfig
pkg.ProjectConfig
}

func (TestConfig) GetEventByKey(key string) (entities.Event, error) {
Expand Down
14 changes: 7 additions & 7 deletions optimizely/client/factory.go → pkg/client/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"errors"
"time"

"github.com/optimizely/go-sdk/optimizely"
"github.com/optimizely/go-sdk/optimizely/config"
"github.com/optimizely/go-sdk/optimizely/decision"
"github.com/optimizely/go-sdk/optimizely/event"
"github.com/optimizely/go-sdk/optimizely/utils"
"github.com/optimizely/go-sdk/pkg"
"github.com/optimizely/go-sdk/pkg/config"
"github.com/optimizely/go-sdk/pkg/decision"
"github.com/optimizely/go-sdk/pkg/event"
"github.com/optimizely/go-sdk/pkg/utils"
)

// OptimizelyFactory is used to construct an instance of the OptimizelyClient
Expand Down Expand Up @@ -91,7 +91,7 @@ func WithPollingConfigManagerRequester(requester utils.Requester, pollingInterva
}

// WithConfigManager sets polling config manager on a client
func WithConfigManager(configManager optimizely.ProjectConfigManager) OptionFunc {
func WithConfigManager(configManager pkg.ProjectConfigManager) OptionFunc {
return func(f *OptimizelyClient) {
f.ConfigManager = configManager
}
Expand Down Expand Up @@ -135,7 +135,7 @@ func WithExecutionContext(executionContext utils.ExecutionCtx) OptionFunc {

// StaticClient returns a client initialized with a static project config
func (f OptimizelyFactory) StaticClient() (*OptimizelyClient, error) {
var configManager optimizely.ProjectConfigManager
var configManager pkg.ProjectConfigManager

if f.SDKKey != "" {
staticConfigManager, err := config.NewStaticProjectConfigManagerFromURL(f.SDKKey)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"testing"
"time"

"github.com/optimizely/go-sdk/optimizely/config"
"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig"
"github.com/optimizely/go-sdk/optimizely/event"
"github.com/optimizely/go-sdk/optimizely/utils"
"github.com/optimizely/go-sdk/pkg/config"
"github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig"
"github.com/optimizely/go-sdk/pkg/event"
"github.com/optimizely/go-sdk/pkg/utils"

"github.com/stretchr/testify/assert"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ package client
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely"
"github.com/optimizely/go-sdk/optimizely/decision"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/optimizely/event"
"github.com/optimizely/go-sdk/optimizely/notification"
"github.com/optimizely/go-sdk/pkg"
"github.com/optimizely/go-sdk/pkg/decision"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/optimizely/go-sdk/pkg/event"
"github.com/optimizely/go-sdk/pkg/notification"
"github.com/stretchr/testify/mock"
)

Expand All @@ -33,7 +33,7 @@ import (
*/

type MockProjectConfig struct {
optimizely.ProjectConfig
pkg.ProjectConfig
mock.Mock
}

Expand Down Expand Up @@ -79,17 +79,17 @@ func (c *MockProjectConfig) GetBotFiltering() bool {
}

type MockProjectConfigManager struct {
projectConfig optimizely.ProjectConfig
projectConfig pkg.ProjectConfig
mock.Mock
}

func (p *MockProjectConfigManager) GetConfig() (optimizely.ProjectConfig, error) {
func (p *MockProjectConfigManager) GetConfig() (pkg.ProjectConfig, error) {
if p.projectConfig != nil {
return p.projectConfig, nil
}

args := p.Called()
return args.Get(0).(optimizely.ProjectConfig), args.Error(1)
return args.Get(0).(pkg.ProjectConfig), args.Error(1)
}

func (p *MockProjectConfigManager) OnProjectConfigUpdate(callback func(notification.ProjectConfigUpdateNotification)) (int, error) {
Expand Down Expand Up @@ -125,10 +125,10 @@ func (m *MockEventProcessor) ProcessEvent(userEvent event.UserEvent) {
}

type PanickingConfigManager struct {
optimizely.ProjectConfigManager
pkg.ProjectConfigManager
}

func (m *PanickingConfigManager) GetConfig() (optimizely.ProjectConfig, error) {
func (m *PanickingConfigManager) GetConfig() (pkg.ProjectConfig, error) {
panic("I'm panicking")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ package datafileprojectconfig
import (
"fmt"

"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/mappers"
"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/optimizely/logging"
"github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/mappers"
"github.com/optimizely/go-sdk/pkg/entities"
"github.com/optimizely/go-sdk/pkg/logging"
)

var logger = logging.GetLogger("DatafileProjectConfig")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"testing"

"github.com/optimizely/go-sdk/optimizely/entities"
"github.com/optimizely/go-sdk/pkg/entities"

"github.com/stretchr/testify/assert"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// Package entities has entity definitions
package entities

import "github.com/optimizely/go-sdk/optimizely/entities"
import "github.com/optimizely/go-sdk/pkg/entities"

// Audience represents an Audience object from the Optimizely datafile
type Audience struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package datafileprojectconfig

import (
"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"

"github.com/json-iterator/go"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"io/ioutil"
"testing"

"github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
"github.com/stretchr/testify/assert"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package mappers

import (
datafileEntities "github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/optimizely/entities"
datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/pkg/entities"
)

// MapAttributes maps the raw datafile attribute entities to SDK Attribute entities
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package mappers
import (
"testing"

datafileEntities "github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/optimizely/entities"
datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/pkg/entities"

"github.com/stretchr/testify/assert"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package mappers

import (
datafileEntities "github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/optimizely/entities"
datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/pkg/entities"
)

// MapAudiences maps the raw datafile audience entities to SDK Audience entities
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ package mappers
import (
"testing"

datafileEntities "github.com/optimizely/go-sdk/optimizely/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/optimizely/entities"
datafileEntities "github.com/optimizely/go-sdk/pkg/config/datafileprojectconfig/entities"
"github.com/optimizely/go-sdk/pkg/entities"

"github.com/stretchr/testify/assert"
)
Expand Down
Loading