Skip to content

Upload UI cleaning. #72

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

Merged
merged 1 commit into from
Apr 10, 2018
Merged

Upload UI cleaning. #72

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
10 changes: 3 additions & 7 deletions bitriseclient/certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package bitriseclient

import (
"fmt"
"math/big"
"net/http"
"path/filepath"
Expand Down Expand Up @@ -184,8 +183,7 @@ func (client *BitriseClient) downloadUploadedIdentity(downloadURL string) (conte

// RegisterIdentity ...
func (client *BitriseClient) RegisterIdentity(certificateSize int64) (RegisterIdentityData, error) {
fmt.Println()
log.Infof("Register %s on Bitrise...", "Identities.p12")
log.Printf("Register %s on Bitrise...", "Identities.p12")

requestURL, err := urlutil.Join(baseURL, appsEndPoint, client.selectedAppSlug, certificatesEndPoint)
if err != nil {
Expand Down Expand Up @@ -220,8 +218,7 @@ func (client *BitriseClient) RegisterIdentity(certificateSize int64) (RegisterId

// UploadIdentity ...
func (client *BitriseClient) UploadIdentity(uploadURL string, uploadFileName string, outputDirPath string, exportFileName string) error {
fmt.Println()
log.Infof("Upload %s to Bitrise...", exportFileName)
log.Printf("Upload %s to Bitrise...", exportFileName)

filePth := filepath.Join(outputDirPath, exportFileName)

Expand All @@ -239,8 +236,7 @@ func (client *BitriseClient) UploadIdentity(uploadURL string, uploadFileName str

// ConfirmIdentityUpload ...
func (client *BitriseClient) ConfirmIdentityUpload(certificateSlug string, certificateUploadName string) error {
fmt.Println()
log.Infof("Confirm - %s - upload to Bitrise...", certificateUploadName)
log.Printf("Confirm - %s - upload to Bitrise...", certificateUploadName)

requestURL, err := urlutil.Join(baseURL, appsEndPoint, client.selectedAppSlug, "build-certificates", certificateSlug, "uploaded")
if err != nil {
Expand Down
10 changes: 3 additions & 7 deletions bitriseclient/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package bitriseclient

import (
"fmt"
"net/http"
"path/filepath"

Expand Down Expand Up @@ -182,8 +181,7 @@ func (client *BitriseClient) downloadUploadedProvisioningProfile(downloadURL str

// RegisterProvisioningProfile ...
func (client *BitriseClient) RegisterProvisioningProfile(provisioningProfSize int64, profile profileutil.ProvisioningProfileInfoModel) (RegisterProvisioningProfileData, error) {
fmt.Println()
log.Infof("Register %s on Bitrise...", profile.Name)
log.Printf("Register %s on Bitrise...", profile.Name)

requestURL, err := urlutil.Join(baseURL, appsEndPoint, client.selectedAppSlug, provisioningProfilesEndPoint)
if err != nil {
Expand Down Expand Up @@ -218,8 +216,7 @@ func (client *BitriseClient) RegisterProvisioningProfile(provisioningProfSize in

// UploadProvisioningProfile ...
func (client *BitriseClient) UploadProvisioningProfile(uploadURL string, uploadFileName string, outputDirPath string, exportFileName string) error {
fmt.Println()
log.Infof("Upload %s to Bitrise...", exportFileName)
log.Printf("Upload %s to Bitrise...", exportFileName)

filePth := filepath.Join(outputDirPath, exportFileName)

Expand All @@ -240,8 +237,7 @@ func (client *BitriseClient) UploadProvisioningProfile(uploadURL string, uploadF

// ConfirmProvisioningProfileUpload ...
func (client *BitriseClient) ConfirmProvisioningProfileUpload(profileSlug string, provUploadName string) error {
fmt.Println()
log.Infof("Confirm - %s - upload to Bitrise...", provUploadName)
log.Printf("Confirm - %s - upload to Bitrise...", provUploadName)

requestURL, err := urlutil.Join(baseURL, appsEndPoint, client.selectedAppSlug, provisioningProfilesEndPoint, profileSlug, "uploaded")
if err != nil {
Expand Down
19 changes: 10 additions & 9 deletions cmd/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,32 +667,35 @@ func getAccessToken() (string, error) {
}

func uploadExportedProvProfiles(bitriseClient *bitriseclient.BitriseClient, profilesToExport []profileutil.ProvisioningProfileInfoModel, outputDirPath string) (bool, error) {
fmt.Println()
log.Infof("Uploading provisioning profiles...")

profilesToUpload, err := filterAlreadyUploadedProvProfiles(bitriseClient, profilesToExport)
if err != nil {
return false, err
}

if len(profilesToUpload) > 0 {
fmt.Println()
log.Infof("Uploading provisioning profiles...")

if err := uploadProvisioningProfiles(bitriseClient, profilesToUpload, outputDirPath); err != nil {
return false, err
}
} else {
log.Warnf("There is no new provisioning profile to upload...")
}

return true, nil
}

func uploadExportedIdentity(bitriseClient *bitriseclient.BitriseClient, certificatesToExport []certificateutil.CertificateInfoModel, outputDirPath string) (bool, error) {
fmt.Println()
log.Infof("Uploading certificate...")

shouldUploadIdentities, err := shouldUploadCertificates(bitriseClient, certificatesToExport)
if err != nil {
return false, err
}

if shouldUploadIdentities {
fmt.Println()
log.Infof("Uploading certificate...")

if err := UploadIdentity(bitriseClient, outputDirPath); err != nil {
return false, err
Expand All @@ -715,8 +718,7 @@ func askUploadIdentities() (bool, error) {
}

func filterAlreadyUploadedProvProfiles(client *bitriseclient.BitriseClient, localProfiles []profileutil.ProvisioningProfileInfoModel) ([]profileutil.ProvisioningProfileInfoModel, error) {
fmt.Println()
log.Infof("Looking for provisioning profile duplicates on Bitrise...")
log.Printf("Looking for provisioning profile duplicates on Bitrise...")

uploadedProfileUUIDList := map[string]bool{}
profilesToUpload := []profileutil.ProvisioningProfileInfoModel{}
Expand Down Expand Up @@ -748,8 +750,7 @@ func filterAlreadyUploadedProvProfiles(client *bitriseclient.BitriseClient, loca
}

func shouldUploadCertificates(client *bitriseclient.BitriseClient, certificatesToExport []certificateutil.CertificateInfoModel) (bool, error) {
fmt.Println()
log.Infof("Looking for certificate duplicates on Bitrise...")
log.Printf("Looking for certificate duplicates on Bitrise...")

var uploadedCertificatesSerialList []string
localCertificatesSerialList := []string{}
Expand Down