Skip to content

Commit

Permalink
no more files
Browse files Browse the repository at this point in the history
  • Loading branch information
@maier-stefan
maier-stefan committed Jun 4, 2019
1 parent 40f9070 commit 50283cd
Show file tree
Hide file tree
Showing 18 changed files with 69 additions and 21 deletions.
5 changes: 4 additions & 1 deletion example/acl_list/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
)

func main() {
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/adgroup_create/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"
"time"

Expand All @@ -13,7 +14,9 @@ import (
func main() {
orgID := int64(1405310)
campaignID := int64(12312323)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", &orgID)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, &orgID)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/adgroup_edit/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -13,7 +14,9 @@ func main() {
orgID := int64(378940)
adGroupID := int64(285227483)
campaignID := int64(284979913)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", &orgID)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, &orgID)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/adgroup_negative_keyword_list/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -12,7 +13,9 @@ import (
func main() {
campaignID := int64(242933727)
adGroupID := int64(242930998)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/adgroup_targeting_keyword_list/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -12,7 +13,9 @@ import (
func main() {
campaignID := int64(262727835)
adGroupID := int64(262765077)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/campaign_create/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -12,7 +13,9 @@ import (
func main() {
orgID := int64(1461850)
adamID := int64(1222530780)
client, err := searchads.NewClient(nil, "../api-keys.pem", "../api-keys.key", &orgID)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, &orgID)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/campaign_delete/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
)

func main() {
orgID := int64(1405310)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", &orgID)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, &orgID)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/campaign_edit/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
)

func main() {
orgID := int64(1405310)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", &orgID)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, &orgID)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/campaign_list/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
)

func main() {
orgID := int64(378940)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", &orgID)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, &orgID)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/campaign_negative_keyword_list/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
)

func main() {
campaignID := int64(242933727)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/campaign_reports/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
)

func main() {
orgID := int64(378940)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", &orgID)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, &orgID)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/search_term_reports/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -12,7 +13,9 @@ import (
func main() {
cID := int64(262773151)
// aID := int64(262825521)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/targeting_keyword_create/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -12,7 +13,9 @@ import (
func main() {
campaignID := int64(262922238)
adGroupID := int64(262982513)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/targeting_keyword_get/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -13,7 +14,9 @@ func main() {
campaignID := int64(262922238)
adGroupID := int64(262982513)
targetingKeywordID := int64(306708156)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/targeting_keyword_list/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -12,7 +13,9 @@ import (
func main() {
campaignID := int64(262922238)
adGroupID := int64(262982513)
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
5 changes: 4 additions & 1 deletion example/targeting_keyword_update/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"log"

"github.com/jonagold-lab/go-apple-search-ads/searchads"
Expand All @@ -18,7 +19,9 @@ func main() {
adGroupID := int64(262987552)
targetingKeywordID := int64(263022253)
*/
client, err := searchads.NewClient(nil, "../cert.pem", "../cert.key", nil)
pemdat, _ := ioutil.ReadFile("../cert.pem")
keydat, _ := ioutil.ReadFile("../cert.key")
client, err := searchads.NewClient(nil, pemdat, keydat, nil)
if err != nil {
log.Fatalf("Client error: %s", err)
panic(err)
Expand Down
8 changes: 4 additions & 4 deletions searchads/searchads.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ func addOptions(s string, opt interface{}) (string, error) {
return u.String(), nil
}

func setClientWithCerts(pemFile, keyFile string) (*http.Client, error) {
cert, err := tls.LoadX509KeyPair(pemFile, keyFile)
func setClientWithCerts(certPEMBlock, keyPEMBlock []byte) (*http.Client, error) {
cert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
if err != nil {
return nil, err
}
Expand All @@ -83,10 +83,10 @@ func setClientWithCerts(pemFile, keyFile string) (*http.Client, error) {
}

// NewClient with either http.Client or with pemFile and keyFile
func NewClient(httpClient *http.Client, pemFile, keyFile string, orgID *int64) (*Client, error) {
func NewClient(httpClient *http.Client, certPEMBlock, keyPEMBlock []byte, orgID *int64) (*Client, error) {
if httpClient == nil {
var err error
httpClient, err = setClientWithCerts(pemFile, keyFile)
httpClient, err = setClientWithCerts(certPEMBlock, keyPEMBlock)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion searchads/searchads_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func setup() (client *Client, mux *http.ServeMux, serverURL string, teardown fun
// configured to use test server.
orgID := int64(1238)
fakeClient := http.Client{}
client, _ = NewClient(&fakeClient, "", "", &orgID)
client, _ = NewClient(&fakeClient, []byte{}, []byte{}, &orgID)
url, _ := url.Parse(server.URL + baseURLPath + "/")
client.BaseURL = url

Expand Down

0 comments on commit 50283cd

Please sign in to comment.