Skip to content

Commit e9c269e

Browse files
authored
GODRIVER-1876 Drop pre Go 1.10 workarounds (#779)
1 parent 432c3fa commit e9c269e

File tree

9 files changed

+3
-149
lines changed

9 files changed

+3
-149
lines changed

.evergreen/config.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,14 +1592,6 @@ tasks:
15921592
vars:
15931593
MONGO_GO_DRIVER_COMPRESSOR: "snappy"
15941594

1595-
- name: go1.9-build
1596-
tags: ["compile-check"]
1597-
commands:
1598-
- func: run-make
1599-
vars:
1600-
targets: "build"
1601-
BUILD_ENV: "PATH=/opt/golang/go1.9/bin:$PATH GOROOT=/opt/golang/go1.9"
1602-
16031595
- name: go1.10-build
16041596
tags: ["compile-check"]
16051597
commands:

bson/bson.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// Based on gopkg.in/mgo.v2/bson by Gustavo Niemeyer
88
// See THIRD-PARTY-NOTICES for original license terms.
99

10-
// +build go1.9
11-
1210
package bson // import "go.mongodb.org/mongo-driver/bson"
1311

1412
import (

bson/bson_1_8.go

Lines changed: 0 additions & 81 deletions
This file was deleted.

mongo/options/clientoptions.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ func addClientCertFromBytes(cfg *tls.Config, data []byte, keyPasswd string) (str
10111011
if err != nil {
10121012
return "", err
10131013
}
1014-
keyBytes, err = x509MarshalPKCS8PrivateKey(decrypted)
1014+
keyBytes, err = x509.MarshalPKCS8PrivateKey(decrypted)
10151015
if err != nil {
10161016
return "", err
10171017
}
@@ -1047,7 +1047,7 @@ func addClientCertFromBytes(cfg *tls.Config, data []byte, keyPasswd string) (str
10471047
return "", err
10481048
}
10491049

1050-
return x509CertSubject(crt), nil
1050+
return crt.Subject.String(), nil
10511051
}
10521052

10531053
func stringSliceContains(source []string, target string) bool {

mongo/options/clientoptions_1_10.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

mongo/options/clientoptions_1_9.go

Lines changed: 0 additions & 20 deletions
This file was deleted.

x/mongo/driver/topology/topology_options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,5 +446,5 @@ func addClientCertFromFile(cfg *tls.Config, clientFile, keyPasswd string) (strin
446446
return "", err
447447
}
448448

449-
return x509CertSubject(crt), nil
449+
return crt.Subject.String(), nil
450450
}

x/mongo/driver/topology/topology_options_1_10.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

x/mongo/driver/topology/topology_options_1_9.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)