Skip to content

Insert Goog-Api-Client Header #14

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 3 commits into from
Sep 20, 2024
Merged

Insert Goog-Api-Client Header #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dafb52
Insert Goog-Api-Client Header
aashishpatil-g Sep 20, 2024
5aaeb56
Feedback - use GoogleUtilities, remove prints.
aashishpatil-g Sep 20, 2024
6c6ccd5
Add GoogleUtilities as a direct dependency, add swift minor version
aashishpatil-g Sep 20, 2024
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
19 changes: 6 additions & 13 deletions Sources/Internal/Version.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,18 @@

import Foundation

import GoogleUtilities_Environment

@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
struct Version {
static let sdkVersion = "11.3.0-beta"

// returns value of form gl-PLATFORM_NAME/PLATFORM_VERSION
static func platformVersionHeader() -> String {
let version = ProcessInfo.processInfo.operatingSystemVersion
let versionString = "\(version.majorVersion).\(version.minorVersion).\(version.patchVersion)"
#if os(iOS)
return "gl-ios/\(versionString)"
#elseif os(watchOS)
return "gl-watchos/\(versionString)"
#elseif os(tvOS)
return "gl-tvos/\(versionString)"
#elseif os(macOS)
return "gl-macos/\(versionString)"
#else
return ""
#endif
let versionString = GULAppEnvironmentUtil.systemVersion()
let platformName = GULAppEnvironmentUtil.applePlatform()

return "gl-\(platformName)/\(versionString)"
}

// returns the build time major version of swift
Expand Down
7 changes: 0 additions & 7 deletions Tests/Unit/HeaderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ final class HeaderTests: XCTestCase {
let values = callOptions.customMetadata.values(
forHeader: GrpcClient.RequestHeaders.googApiClient, canonicalForm: false
)
for value in values {
print("value \(value)")
}
print("values \(values)")
let contains = values
.contains {
$0 ==
Expand All @@ -84,9 +80,6 @@ final class HeaderTests: XCTestCase {
let values = callOptions.customMetadata.values(
forHeader: GrpcClient.RequestHeaders.googApiClient, canonicalForm: false
)
for value in values {
print("value \(value)")
}
let contains = values
.contains {
$0 ==
Expand Down