upgrade: bump cli to v2

Author: mateen993

README.md

@@ -2,7 +2,7 @@
 set -e
 
 APP_NAME="ipgeolocation"
-VERSION="1.0.3"   # fixed version
+VERSION="2.0.0"   # fixed version
 
 rm -rf dist
 mkdir -p dist

build-release.sh

@@ -36,7 +36,7 @@ Example:
 			return
 		}
 
-		baseURL := "https://api.ipgeolocation.io/v2/abuse"
+		baseURL := "https://api.ipgeolocation.io/v3/abuse"
 		url := baseURL + "?apiKey=" + cfg.ApiKey
 		if abuseFlags.IP != "" {
 			url += "&ip=" + abuseFlags.IP

cmd/abuse.go

@@ -38,7 +38,7 @@ Getting peering relationships for an ASN number: ipgeolocation asn --asn 12345 -
 			return
 		}
 
-		baseURL := "https://api.ipgeolocation.io/v2/asn"
+		baseURL := "https://api.ipgeolocation.io/v3/asn"
 		url := baseURL + "?apiKey=" + cfg.ApiKey
 		if asnFlags.IP != "" {
 			url += "&ip=" + asnFlags.IP

cmd/asn.go

@@ -54,7 +54,7 @@ API Reference: https://ipgeolocation.io/astronomy-api.html
 			return
 		}
 
-		baseURL := "https://api.ipgeolocation.io/v2/astronomy"
+		baseURL := "https://api.ipgeolocation.io/v3/astronomy"
 		url := baseURL + "?apiKey=" + cfg.ApiKey
 		if astronomyFlags.IP != "" {
 			url += "&ip=" + astronomyFlags.IP

cmd/astronomy.go

@@ -43,7 +43,7 @@ Examples:
 			return
 		}
 
-		baseURL := "https://api.ipgeolocation.io/v2/astronomy/timeSeries"
+		baseURL := "https://api.ipgeolocation.io/v3/astronomy/timeSeries"
 		url := baseURL + "?apiKey=" + cfg.ApiKey
 
 		if astronomyTimeseriesFlags.DateStart == "" || astronomyTimeseriesFlags.DateEnd == "" {

cmd/astronomyTimeseries.go

@@ -28,8 +28,7 @@ Example Use Cases:
 
 Retrieving security information for a list of IP addresses: ipgeolocation bulk-ip-security --ips "8.8.8.8,8.8.4.4"
 
-Retrieving security information for a list of IP addresses with including additional fields: ipgeolocation bulk-ip-security --ips "8.8.8.8,8.8.4.4" --include=location,time_zone
-`,
+Retrieving security information for IP addresses from a file: ipgeolocation bulk-ip-security --file ips.txt`,
 	Run: func(cmd *cobra.Command, args []string) {
 		cfg, err := config.Load()
 		if err != nil || cfg.ApiKey == "" {
@@ -64,13 +63,9 @@ Retrieving security information for a list of IP addresses with including additi
 			return
 		}
 
-		baseURL := "https://api.ipgeolocation.io/v2/security-bulk"
+		baseURL := "https://api.ipgeolocation.io/v3/security-bulk"
 		url := baseURL + "?apiKey=" + cfg.ApiKey
 
-		if len(bulkSecurityFlags.Include) > 0 {
-			url += "&include=" + strings.Join(bulkSecurityFlags.Include, ",")
-		}
-
 		if len(bulkSecurityFlags.Excludes) > 0 {
 			url += "&excludes=" + strings.Join(bulkSecurityFlags.Excludes, ",")
 		}
@@ -79,9 +74,6 @@ Retrieving security information for a list of IP addresses with including additi
 			url += "&fields=" + strings.Join(bulkSecurityFlags.Fields, ",")
 		}
 
-		if bulkSecurityFlags.Language != "" {
-			url += "&lang=" + bulkSecurityFlags.Language
-		}
 		payload := map[string]interface{}{
 			"ips": bulkSecurityFlags.IPs,
 		}
@@ -128,10 +120,8 @@ Retrieving security information for a list of IP addresses with including additi
 
 func init() {
 	bulkIpSecurityCmd.Flags().StringSliceVar(&bulkSecurityFlags.IPs, "ips", []string{}, "IPs")
-	bulkIpSecurityCmd.Flags().StringSliceVar(&bulkSecurityFlags.Include, "include", []string{}, "To include additional values in the output")
 	bulkIpSecurityCmd.Flags().StringSliceVar(&bulkSecurityFlags.Excludes, "exclude", []string{}, "Fields to exclude from the output")
 	bulkIpSecurityCmd.Flags().StringSliceVar(&bulkSecurityFlags.Fields, "fields", []string{}, "Get Specific Fields to include in the output")
-	bulkIpSecurityCmd.Flags().StringVar(&bulkSecurityFlags.Language, "lang", "", "Language for the output")
 	bulkIpSecurityCmd.Flags().StringVar(&bulkSecurityFlags.Output, "output", "pretty", "Output format: pretty, raw, table")
 	bulkIpSecurityCmd.Flags().StringVar(&bulkSecurityFlags.File, "file", "", "Path to a text file containing IPs (one per line)")
 	bulkIpSecurityCmd.Flags().StringVar(&bulkSecurityFlags.OutputFile, "output-file", "", "Save output to a file (JSON only)")

cmd/bulkIpSecurity.go

@@ -34,8 +34,6 @@ Examples:
   # Get security info of a public IP
   ipgeolocation ip-security --ip 8.8.8.8
 
-  # Get security info of a public IP with additional fields
-  ipgeolocation ip-security --ip 8.8.8.8 --include=location,time_zone
 
 Notes: 
   - You must have a valid API key configured using: ipgeolocation config --apikey=<your_key>
@@ -48,16 +46,12 @@ Notes:
 			return
 		}
 
-		baseURL := "https://api.ipgeolocation.io/v2/security"
+		baseURL := "https://api.ipgeolocation.io/v3/security"
 		url := baseURL + "?apiKey=" + cfg.ApiKey
 		if securityFlags.IP != "" {
 			url += "&ip=" + securityFlags.IP
 		}
 
-		if len(securityFlags.Include) > 0 {
-			url += "&include=" + strings.Join(securityFlags.Include, ",")
-		}
-
 		if len(securityFlags.Excludes) > 0 {
 			url += "&excludes=" + strings.Join(securityFlags.Excludes, ",")
 		}
@@ -66,10 +60,6 @@ Notes:
 			url += "&fields=" + strings.Join(securityFlags.Fields, ",")
 		}
 
-		if securityFlags.Language != "" {
-			url += "&lang=" + securityFlags.Language
-		}
-
 		resp, err := http.Get(url)
 		if err != nil {
 			fmt.Println("Error fetching ip security info:", err)
@@ -111,10 +101,8 @@ Notes:
 
 func init() {
 	ipSecurityCmd.Flags().StringVar(&securityFlags.IP, "ip", "", "IPv4 or IPv6 address (e.g. 8.8.8.8)")
-	ipSecurityCmd.Flags().StringSliceVar(&securityFlags.Include, "include", []string{}, "To include additional values in the output")
 	ipSecurityCmd.Flags().StringSliceVar(&securityFlags.Excludes, "exclude", []string{}, "Fields to exclude from the output")
 	ipSecurityCmd.Flags().StringSliceVar(&securityFlags.Fields, "fields", []string{}, "Get Specific Fields to include in the output")
-	ipSecurityCmd.Flags().StringVar(&securityFlags.Language, "lang", "", "Language for the output")
 	ipSecurityCmd.Flags().StringVar(&securityFlags.Output, "output", "pretty", "Output format: pretty, raw, table, yaml")
 
 	rootCmd.AddCommand(ipSecurityCmd)

cmd/ipSecurity.go

@@ -56,7 +56,7 @@ Notes:
 			return
 		}
 
-		baseURL := "https://api.ipgeolocation.io/v2/ipgeo"
+		baseURL := "https://api.ipgeolocation.io/v3/ipgeo"
 		url := baseURL + "?apiKey=" + cfg.ApiKey
 		if ipgeoFlags.IP != "" {
 			url += "&ip=" + ipgeoFlags.IP

cmd/ipgeo.go

@@ -71,7 +71,7 @@ Examples:
 			return
 		}
 
-		baseURL := "https://api.ipgeolocation.io/v2/ipgeo-bulk"
+		baseURL := "https://api.ipgeolocation.io/v3/ipgeo-bulk"
 		url := baseURL + "?apiKey=" + cfg.ApiKey
 
 		if len(bulkIpgeoFlags.Include) > 0 {