You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2020/06/29 22:24:47 UTC
[trafficcontrol] branch master updated: Support IMS header in Get
endpoints (#4665)
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 83d3012 Support IMS header in Get endpoints (#4665)
83d3012 is described below
commit 83d3012eec70646c958225025a364650b9aea99c
Author: Srijeet Chatterjee <30...@users.noreply.github.com>
AuthorDate: Mon Jun 29 16:24:34 2020 -0600
Support IMS header in Get endpoints (#4665)
* Initial changes for TOType
* Adding dummy methods for other components
* Wip
* cleanup
* Tests passing
* cleanup
* Fix queries for CiaB
* Refactoring based on review
* cleanup
* changelog
* Formatting
* code review resolution
* Fixing db migrations
* Code review fix
* Migration fix
* Code review fixes
* Changes to migrations
* Adding new tables in migration
* add missing tables to seeds file
* Fixing merge and logging
* Formatting
* Code review refactor
* Code review
* Add nil pointer checks
* Adding tests
* Working tests
* Adding API tests for IMS
* Removing unneeded params from queries
* Fix migration
* Fixes for last-modified upon getting a 200
* Adding use ims flag to conf
---
CHANGELOG.md | 1 +
docs/source/admin/traffic_ops.rst | 4 +
lib/go-rfc/http.go | 2 +
traffic_ops/app/conf/cdn.conf | 1 +
.../2020062923101648_add_deleted_tables.sql | 470 +++++++++++++++++++++
traffic_ops/app/db/seeds.sql | 54 +++
traffic_ops/client/about.go | 2 +-
traffic_ops/client/api_capability.go | 2 +-
traffic_ops/client/asn.go | 12 +-
traffic_ops/client/cachegroup.go | 55 ++-
traffic_ops/client/cachegroup_parameters.go | 26 +-
traffic_ops/client/capability.go | 20 +-
traffic_ops/client/cdn.go | 46 +-
traffic_ops/client/cdn_domains.go | 5 +-
traffic_ops/client/cdnfederations.go | 15 +-
traffic_ops/client/coordinate.go | 36 +-
traffic_ops/client/crconfig.go | 4 +-
traffic_ops/client/deliveryservice.go | 61 +--
traffic_ops/client/deliveryservice_regexes.go | 2 +-
.../client/deliveryservice_request_comments.go | 26 +-
traffic_ops/client/deliveryservice_requests.go | 48 ++-
.../deliveryservices_required_capabilities.go | 5 +-
traffic_ops/client/deliveryserviceserver.go | 6 +-
traffic_ops/client/division.go | 36 +-
traffic_ops/client/federation.go | 34 +-
.../client/federation_federation_resolver.go | 4 +-
traffic_ops/client/federation_resolver.go | 24 +-
traffic_ops/client/iso.go | 2 +-
traffic_ops/client/job.go | 6 +-
traffic_ops/client/log.go | 2 +-
traffic_ops/client/origin.go | 18 +-
traffic_ops/client/parameter.go | 65 ++-
traffic_ops/client/phys_location.go | 38 +-
traffic_ops/client/ping.go | 2 +-
traffic_ops/client/profile.go | 74 +++-
traffic_ops/client/profile_parameter.go | 26 +-
traffic_ops/client/region.go | 40 +-
traffic_ops/client/role.go | 46 +-
traffic_ops/client/server.go | 56 ++-
traffic_ops/client/server_server_capabilities.go | 5 +-
traffic_ops/client/server_update_status.go | 6 +-
traffic_ops/client/servercapability.go | 24 +-
traffic_ops/client/servercheck.go | 2 +-
traffic_ops/client/servercheckextensions.go | 6 +-
traffic_ops/client/session.go | 40 +-
traffic_ops/client/staticdnsentry.go | 42 +-
traffic_ops/client/stats_summary.go | 4 +-
traffic_ops/client/status.go | 36 +-
traffic_ops/client/steering.go | 10 +-
traffic_ops/client/steeringtarget.go | 8 +-
traffic_ops/client/tenant.go | 24 +-
traffic_ops/client/topology.go | 14 +-
traffic_ops/client/traffic_monitor.go | 2 +-
traffic_ops/client/traffic_stats.go | 2 +-
traffic_ops/client/type.go | 36 +-
traffic_ops/client/user.go | 34 +-
traffic_ops/client/util.go | 18 +-
traffic_ops/testing/api/conf/traffic-ops-test.conf | 1 +
traffic_ops/testing/api/config/config.go | 1 +
.../testing/api/v3/cachegroups_parameters_test.go | 29 +-
traffic_ops/testing/api/v3/cachegroups_test.go | 124 +++++-
.../api/v3/cachegroupsdeliveryservices_test.go | 6 +-
traffic_ops/testing/api/v3/capabilities_test.go | 29 +-
traffic_ops/testing/api/v3/cdn_domains_test.go | 21 +-
traffic_ops/testing/api/v3/cdnfederations_test.go | 13 +-
traffic_ops/testing/api/v3/cdns_test.go | 62 ++-
traffic_ops/testing/api/v3/cookie_test.go | 4 +-
traffic_ops/testing/api/v3/coordinates_test.go | 62 ++-
traffic_ops/testing/api/v3/crconfig_test.go | 8 +-
.../v3/deliveryservice_request_comments_test.go | 60 ++-
.../api/v3/deliveryservice_requests_test.go | 66 ++-
.../deliveryservices_required_capabilities_test.go | 138 +++++-
.../testing/api/v3/deliveryservices_test.go | 77 +++-
.../testing/api/v3/deliveryserviceservers_test.go | 18 +-
.../api/v3/deliveryservicesideligible_test.go | 23 +-
.../testing/api/v3/deliveryservicesregexes_test.go | 25 +-
traffic_ops/testing/api/v3/divisions_test.go | 64 ++-
.../testing/api/v3/federation_resolvers_test.go | 35 +-
.../testing/api/v3/federation_users_test.go | 69 ++-
traffic_ops/testing/api/v3/federations_test.go | 33 +-
traffic_ops/testing/api/v3/iso_test.go | 2 +-
traffic_ops/testing/api/v3/jobs_test.go | 10 +-
traffic_ops/testing/api/v3/loginfail_test.go | 2 +-
traffic_ops/testing/api/v3/parameters_test.go | 62 ++-
traffic_ops/testing/api/v3/phys_locations_test.go | 67 ++-
.../testing/api/v3/profile_parameters_test.go | 32 +-
traffic_ops/testing/api/v3/profiles_test.go | 56 ++-
.../testing/api/v3/readonlycannotmodify_test.go | 2 +-
traffic_ops/testing/api/v3/regions_test.go | 64 ++-
traffic_ops/testing/api/v3/roles_test.go | 63 ++-
.../testing/api/v3/servercapabilities_test.go | 9 +-
traffic_ops/testing/api/v3/servers_test.go | 103 ++++-
.../servers_to_deliveryservice_assignment_test.go | 18 +-
.../testing/api/v3/serverservercapability_test.go | 35 +-
.../testing/api/v3/serverupdatestatus_test.go | 14 +-
.../testing/api/v3/staticdnsentries_test.go | 69 ++-
traffic_ops/testing/api/v3/statuses_test.go | 71 +++-
traffic_ops/testing/api/v3/steering_test.go | 2 +-
traffic_ops/testing/api/v3/steeringtargets_test.go | 73 +++-
traffic_ops/testing/api/v3/tenants_test.go | 32 +-
traffic_ops/testing/api/v3/topologies_test.go | 5 +-
traffic_ops/testing/api/v3/traffic_ops_test.go | 3 +-
traffic_ops/testing/api/v3/types_test.go | 66 ++-
traffic_ops/testing/api/v3/user_test.go | 79 +++-
traffic_ops/traffic_ops_golang/api/generic_crud.go | 85 +++-
.../traffic_ops_golang/api/shared_handlers.go | 19 +-
.../traffic_ops_golang/api/shared_handlers_test.go | 5 +-
.../traffic_ops_golang/api/shared_interfaces.go | 6 +-
traffic_ops/traffic_ops_golang/apitenant/tenant.go | 25 +-
traffic_ops/traffic_ops_golang/asn/asns.go | 23 +-
traffic_ops/traffic_ops_golang/asn/asns_test.go | 2 +-
.../traffic_ops_golang/cachegroup/cachegroups.go | 39 +-
.../cachegroup/cachegroups_test.go | 4 +-
.../cachegroupparameter/parameters.go | 43 +-
.../cachegroupparameter/parameters_test.go | 2 +-
.../cachegroupparameter/unassigned_parameters.go | 32 +-
traffic_ops/traffic_ops_golang/cdn/cdns.go | 13 +-
traffic_ops/traffic_ops_golang/cdn/cdns_test.go | 2 +-
traffic_ops/traffic_ops_golang/cdn/configs.go | 13 +-
traffic_ops/traffic_ops_golang/cdn/domains.go | 45 +-
.../cdnfederation/cdnfederations.go | 30 +-
traffic_ops/traffic_ops_golang/config/config.go | 2 +-
.../traffic_ops_golang/coordinate/coordinates.go | 19 +-
.../coordinate/coordinates_test.go | 2 +-
.../traffic_ops_golang/dbhelpers/db_helpers.go | 1 -
.../deliveryservice/deliveryservices.go | 54 ++-
.../deliveryservices_required_capabilities.go | 45 +-
.../deliveryservices_required_capabilities_test.go | 2 +-
.../deliveryservice/request/comment/comments.go | 14 +-
.../deliveryservice/request/requests.go | 38 +-
.../traffic_ops_golang/deliveryservice/safe.go | 11 +-
.../deliveryservice/servers/servers.go | 107 ++++-
.../traffic_ops_golang/division/divisions.go | 17 +-
.../traffic_ops_golang/division/divisions_test.go | 2 +-
.../federation_resolvers/federation_resolvers.go | 90 +++-
.../federations/allfederations.go | 154 ++++++-
traffic_ops/traffic_ops_golang/federations/ds.go | 14 +-
.../traffic_ops_golang/federations/federations.go | 143 ++++++-
traffic_ops/traffic_ops_golang/federations/user.go | 21 +-
.../invalidationjobs/invalidationjobs.go | 37 +-
traffic_ops/traffic_ops_golang/origin/origins.go | 47 ++-
.../traffic_ops_golang/origin/origins_test.go | 2 +-
.../traffic_ops_golang/parameter/parameters.go | 40 +-
.../parameter/parameters_test.go | 2 +-
.../physlocation/phys_locations.go | 14 +-
.../physlocation/phys_locations_test.go | 2 +-
traffic_ops/traffic_ops_golang/profile/copy.go | 4 +-
traffic_ops/traffic_ops_golang/profile/profiles.go | 35 +-
.../traffic_ops_golang/profile/profiles_test.go | 2 +-
.../profileparameter/profile_parameters.go | 15 +-
.../profileparameter/profile_parameters_test.go | 2 +-
traffic_ops/traffic_ops_golang/region/regions.go | 20 +-
.../traffic_ops_golang/region/regions_test.go | 2 +-
traffic_ops/traffic_ops_golang/role/roles.go | 19 +-
.../routing/middleware/wrappers.go | 21 +-
traffic_ops/traffic_ops_golang/server/servers.go | 114 +++--
.../server/servers_server_capability.go | 13 +-
.../traffic_ops_golang/server/servers_test.go | 5 +-
.../servercapability/servercapability.go | 18 +-
.../staticdnsentry/staticdnsentry.go | 21 +-
traffic_ops/traffic_ops_golang/status/statuses.go | 19 +-
.../traffic_ops_golang/status/statuses_test.go | 2 +-
.../steeringtargets/steeringtargets.go | 49 ++-
.../traffic_ops_golang/topology/topologies.go | 39 +-
traffic_ops/traffic_ops_golang/types/types.go | 15 +-
traffic_ops/traffic_ops_golang/types/types_test.go | 2 +-
traffic_ops/traffic_ops_golang/user/user.go | 37 +-
traffic_ops/traffic_ops_golang/util/ims/ims.go | 87 ++++
168 files changed, 4401 insertions(+), 1004 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fa6c64..a5c2cfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Added debugging functionality to CDN-in-a-Box.
- Added an SMTP server to CDN-in-a-Box.
- Cached builder Docker images on Docker Hub to speed up build time
+- Added functionality in the GET endpoints to support the "If-Modified-Since" header in the incoming requests.
- Traffic Ops Golang Endpoints
- /api/2.0 for all of the most recent route versions
- /api/1.1/cachegroupparameters/{{cachegroupID}}/{{parameterID}} `(DELETE)`
diff --git a/docs/source/admin/traffic_ops.rst b/docs/source/admin/traffic_ops.rst
index 2bb56b6..7a54f41 100644
--- a/docs/source/admin/traffic_ops.rst
+++ b/docs/source/admin/traffic_ops.rst
@@ -443,6 +443,10 @@ This file deals with the configuration parameters of running Traffic Ops itself.
:disabled_routes: A list of API route IDs to disable. Requests matching these routes will receive a 503 response. To find the route ID for a given path you would like to disable, run ``./traffic_ops_golang`` using the :option:`--api-routes` option to view all the route information, including route IDs and paths.
:ignore_unknown_routes: If ``false`` (default) return an error and prevent startup if unknown route IDs are found. Otherwise, log a warning and continue startup.
+:use_ims:
+ .. versionadded:: 5.0
+ This is an optional boolean value to enable the handling of the "If-Modified-Since" HTTP request header. Default: false
+
Example cdn.conf
''''''''''''''''
.. include:: ../../../traffic_ops/app/conf/cdn.conf
diff --git a/lib/go-rfc/http.go b/lib/go-rfc/http.go
index e9cf162..3e9fb6e 100644
--- a/lib/go-rfc/http.go
+++ b/lib/go-rfc/http.go
@@ -36,6 +36,8 @@ const (
ContentDisposition = "Content-Disposition" // RFC6266
ApplicationOctetStream = "application/octet-stream" // RFC2046§4.5.2
Vary = "Vary" // RFC7231§7.1.4
+ IfModifiedSince = "If-Modified-Since" // RFC7232§3.3
+ LastModified = "Last-Modified" // RFC7232§2.2
)
// AcceptsGzip returns whether r accepts gzip encoding, per RFC7231§5.3.4.
diff --git a/traffic_ops/app/conf/cdn.conf b/traffic_ops/app/conf/cdn.conf
index 5f68106..8fe6e49 100644
--- a/traffic_ops/app/conf/cdn.conf
+++ b/traffic_ops/app/conf/cdn.conf
@@ -41,6 +41,7 @@
},
"profiling_enabled": false
},
+ "use_ims": false,
"cors" : {
"access_control_allow_origin" : "*"
},
diff --git a/traffic_ops/app/db/migrations/2020062923101648_add_deleted_tables.sql b/traffic_ops/app/db/migrations/2020062923101648_add_deleted_tables.sql
new file mode 100644
index 0000000..c22a042
--- /dev/null
+++ b/traffic_ops/app/db/migrations/2020062923101648_add_deleted_tables.sql
@@ -0,0 +1,470 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+-- +goose Up
+-- SQL in section 'Up' is executed when this migration is applied
+
+-- last_deleted
+CREATE TABLE IF NOT EXISTS last_deleted (
+ table_name text NOT NULL PRIMARY KEY,
+ last_updated timestamp with time zone NOT NULL DEFAULT now()
+);
+
+-- +goose StatementBegin
+-- SQL in section 'Up' is executed when this migration is applied
+--
+-- Name: on_delete_current_timestamp_last_updated(); Type: FUNCTION; Schema: public; Owner: traffic_ops
+--
+CREATE OR REPLACE FUNCTION on_delete_current_timestamp_last_updated()
+ RETURNS trigger
+ AS $$
+BEGIN
+ update last_deleted set last_updated = now() where table_name = TG_ARGV[0];
+ RETURN NEW;
+END;
+$$
+LANGUAGE plpgsql;
+-- +goose StatementEnd
+
+ALTER FUNCTION public.on_delete_current_timestamp_last_updated() OWNER TO traffic_ops;
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON api_capability
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('api_capability');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON asn
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('asn');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON cachegroup
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('cachegroup');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON cachegroup_fallbacks
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('cachegroup_fallbacks');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON cachegroup_localization_method
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('cachegroup_localization_method');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON cachegroup_parameter
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('cachegroup_parameter');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON capability
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('capability');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON cdn
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('cdn');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON coordinate
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('coordinate');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON deliveryservice
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('deliveryservice');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON deliveryservice_regex
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('deliveryservice_regex');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON deliveryservice_request
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('deliveryservice_request');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON deliveryservice_request_comment
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('deliveryservice_request_comment');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON deliveryservice_server
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('deliveryservice_server');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON deliveryservice_tmuser
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('deliveryservice_tmuser');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON division
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('division');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON federation
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('federation');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON federation_deliveryservice
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('federation_deliveryservice');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON federation_federation_resolver
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('federation_federation_resolver');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON federation_resolver
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('federation_resolver');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON federation_tmuser
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('federation_tmuser');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON hwinfo
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('hwinfo');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON job
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('job');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON job_agent
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('job_agent');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON job_status
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('job_status');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON log
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('log');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON origin
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('origin');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON parameter
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('parameter');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON phys_location
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('phys_location');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON profile
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('profile');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON profile_parameter
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('profile_parameter');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON regex
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('regex');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON region
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('region');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON role
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('role');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON role_capability
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('role_capability');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON server
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('server');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON servercheck
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('servercheck');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON snapshot
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('snapshot');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON staticdnsentry
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('staticdnsentry');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON stats_summary
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('stats_summary');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON status
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('status');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON steering_target
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('steering_target');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON tenant
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('tenant');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON tm_user
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('tm_user');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON to_extension
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('to_extension');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON topology
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('topology');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON topology_cachegroup
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('topology_cachegroup');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON topology_cachegroup_parents
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('topology_cachegroup_parents');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON type
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('type');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON user_role
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('user_role');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON server_capability
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('server_capability');
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON server_server_capability
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('server_server_capability');
+
+
+CREATE TRIGGER on_delete_current_timestamp
+AFTER DELETE
+ON deliveryservices_required_capability
+FOR EACH ROW EXECUTE PROCEDURE on_delete_current_timestamp_last_updated('deliveryservices_required_capability');
+
+create index api_capability_last_updated_idx on api_capability (last_updated DESC NULLS LAST);
+create index asn_last_updated_idx on asn (last_updated DESC NULLS LAST);
+create index cachegroup_last_updated_idx on cachegroup (last_updated DESC NULLS LAST);
+create index cachegroup_parameter_last_updated_idx on cachegroup_parameter (last_updated DESC NULLS LAST);
+create index capability_last_updated_idx on capability (last_updated DESC NULLS LAST);
+create index cdn_last_updated_idx on cdn (last_updated DESC NULLS LAST);
+create index coordinate_last_updated_idx on coordinate (last_updated DESC NULLS LAST);
+create index deliveryservice_last_updated_idx on deliveryservice (last_updated DESC NULLS LAST);
+create index deliveryservice_regex_last_updated_idx on deliveryservice_regex (last_updated DESC NULLS LAST);
+create index deliveryservice_request_last_updated_idx on deliveryservice_request (last_updated DESC NULLS LAST);
+create index deliveryservice_request_comment_last_updated_idx on deliveryservice_request_comment (last_updated DESC NULLS LAST);
+create index deliveryservice_server_last_updated_idx on deliveryservice_server (last_updated DESC NULLS LAST);
+create index deliveryservice_tmuser_last_updated_idx on deliveryservice_tmuser (last_updated DESC NULLS LAST);
+create index division_last_updated_idx on division (last_updated DESC NULLS LAST);
+create index federation_last_updated_idx on federation (last_updated DESC NULLS LAST);
+create index federation_deliveryservice_last_updated_idx on federation_deliveryservice (last_updated DESC NULLS LAST);
+create index federation_federation_resolver_last_updated_idx on federation_federation_resolver (last_updated DESC NULLS LAST);
+create index federation_resolver_last_updated_idx on federation_resolver (last_updated DESC NULLS LAST);
+create index federation_tmuser_last_updated_idx on federation_tmuser (last_updated DESC NULLS LAST);
+create index hwinfo_last_updated_idx on hwinfo (last_updated DESC NULLS LAST);
+create index job_last_updated_idx on job (last_updated DESC NULLS LAST);
+create index job_agent_last_updated_idx on job_agent (last_updated DESC NULLS LAST);
+create index job_status_last_updated_idx on job_status (last_updated DESC NULLS LAST);
+create index log_last_updated_idx on log (last_updated DESC NULLS LAST);
+create index origin_last_updated_idx on origin (last_updated DESC NULLS LAST);
+create index parameter_last_updated_idx on parameter (last_updated DESC NULLS LAST);
+create index pys_location_last_updated_idx on phys_location (last_updated DESC NULLS LAST);
+create index profile_last_updated_idx on profile (last_updated DESC NULLS LAST);
+create index profile_parameter_last_updated_idx on profile_parameter (last_updated DESC NULLS LAST);
+create index regex_last_updated_idx on regex (last_updated DESC NULLS LAST);
+create index region_last_updated_idx on region (last_updated DESC NULLS LAST);
+create index role_last_updated_idx on role (last_updated DESC NULLS LAST);
+create index role_capability_last_updated_idx on role_capability (last_updated DESC NULLS LAST);
+create index server_last_updated_idx on server (last_updated DESC NULLS LAST);
+create index servercheck_last_updated_idx on servercheck (last_updated DESC NULLS LAST);
+create index snapshot_last_updated_idx on snapshot (last_updated DESC NULLS LAST);
+create index staticdnsentry_last_updated_idx on staticdnsentry (last_updated DESC NULLS LAST);
+create index status_last_updated_idx on status (last_updated DESC NULLS LAST);
+create index steering_target_last_updated_idx on steering_target (last_updated DESC NULLS LAST);
+create index tenant_last_updated_idx on tenant (last_updated DESC NULLS LAST);
+create index tm_user_last_updated_idx on tm_user (last_updated DESC NULLS LAST);
+create index to_extension_last_updated_idx on to_extension (last_updated DESC NULLS LAST);
+create index topology_last_updated_idx on topology_cachegroup (last_updated DESC NULLS LAST);
+create index topology_cachegroup_last_updated_idx on topology_cachegroup (last_updated DESC NULLS LAST);
+create index topology_cachegroup_parents_last_updated_idx on topology_cachegroup_parents (last_updated DESC NULLS LAST);
+create index type_last_updated_idx on type (last_updated DESC NULLS LAST);
+create index user_role_last_updated_idx on user_role (last_updated DESC NULLS LAST);
+create index server_capability_last_updated_idx on server_capability (last_updated DESC NULLS LAST);
+create index server_server_capability_last_updated_idx on server_server_capability (last_updated DESC NULLS LAST);
+create index deliveryservices_required_capability_last_updated_idx on deliveryservices_required_capability (last_updated DESC NULLS LAST);
+
+-- +goose Down
+-- SQL section 'Down' is executed when this migration is rolled back
+DROP TABLE IF EXISTS last_deleted;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on api_capability;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on asn;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on cachegroup;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on cachegroup_fallbacks;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on cachegroup_localization_method;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on cachegroup_parameter;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on capability;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on cdn;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on coordinate;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on deliveryservice;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on deliveryservice_regex;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on deliveryservice_request;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on deliveryservice_request_comment;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on deliveryservice_server;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on deliveryservice_tmuser;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on division;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on federation;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on federation_deliveryservice;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on federation_federation_resolver;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on federation_resolver;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on federation_tmuser;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on hwinfo;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on job;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on job_agent;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on job_status;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on log;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on origin;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on parameter;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on phys_location;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on profile;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on profile_parameter;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on regex;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on region;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on role;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on role_capability;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on server;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on servercheck;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on snapshot;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on staticdnsentry;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on stats_summary;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on status;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on steering_target;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on tenant;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on tm_user;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on topology;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on topology_cachegroup;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on topology_cachegroup_parents;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on to_extension;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on type;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on user_role;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on server_capability;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on server_server_capability;
+DROP TRIGGER IF EXISTS on_delete_current_timestamp on deliveryservices_required_capability;
+
+DROP INDEX IF EXISTS api_capability_last_updated_idx;
+DROP INDEX IF EXISTS asn_last_updated_idx;
+DROP INDEX IF EXISTS cachegroup_last_updated_idx;
+DROP INDEX IF EXISTS cachegroup_parameter_last_updated_idx;
+DROP INDEX IF EXISTS capability_last_updated_idx;
+DROP INDEX IF EXISTS cdn_last_updated_idx;
+DROP INDEX IF EXISTS coordinate_last_updated_idx;
+DROP INDEX IF EXISTS deliveryservice_last_updated_idx;
+DROP INDEX IF EXISTS deliveryservice_regex_last_updated_idx;
+DROP INDEX IF EXISTS deliveryservice_request_last_updated_idx;
+DROP INDEX IF EXISTS deliveryservice_request_comment_last_updated_idx;
+DROP INDEX IF EXISTS deliveryservice_server_last_updated_idx;
+DROP INDEX IF EXISTS deliveryservice_tmuser_last_updated_idx;
+DROP INDEX IF EXISTS division_last_updated_idx;
+DROP INDEX IF EXISTS federation_last_updated_idx;
+DROP INDEX IF EXISTS federation_deliveryservice_last_updated_idx;
+DROP INDEX IF EXISTS federation_federation_resolver_last_updated_idx;
+DROP INDEX IF EXISTS federation_resolver_last_updated_idx;
+DROP INDEX IF EXISTS federation_tmuser_last_updated_idx;
+DROP INDEX IF EXISTS hwinfo_last_updated_idx;
+DROP INDEX IF EXISTS job_last_updated_idx;
+DROP INDEX IF EXISTS job_agent_last_updated_idx;
+DROP INDEX IF EXISTS job_status_last_updated_idx;
+DROP INDEX IF EXISTS log_last_updated_idx;
+DROP INDEX IF EXISTS origin_last_updated_idx;
+DROP INDEX IF EXISTS parameter_last_updated_idx;
+DROP INDEX IF EXISTS pys_location_last_updated_idx;
+DROP INDEX IF EXISTS profile_last_updated_idx;
+DROP INDEX IF EXISTS profile_parameter_last_updated_idx;
+DROP INDEX IF EXISTS regex_last_updated_idx;
+DROP INDEX IF EXISTS region_last_updated_idx;
+DROP INDEX IF EXISTS role_last_updated_idx;
+DROP INDEX IF EXISTS role_capability_last_updated_idx;
+DROP INDEX IF EXISTS server_last_updated_idx;
+DROP INDEX IF EXISTS servercheck_last_updated_idx;
+DROP INDEX IF EXISTS snapshot_last_updated_idx;
+DROP INDEX IF EXISTS staticdnsentry_last_updated_idx;
+DROP INDEX IF EXISTS status_last_updated_idx;
+DROP INDEX IF EXISTS steering_target_last_updated_idx;
+DROP INDEX IF EXISTS tenant_last_updated_idx;
+DROP INDEX IF EXISTS tm_user_last_updated_idx;
+DROP INDEX IF EXISTS to_extension_last_updated_idx;
+DROP INDEX IF EXISTS topology_last_updated_idx;
+DROP INDEX IF EXISTS topology_cachegroup_last_updated_idx;
+DROP INDEX IF EXISTS topology_cachegroup_parents_last_updated_idx;
+DROP INDEX IF EXISTS type_last_updated_idx;
+DROP INDEX IF EXISTS user_role_last_updated_idx;
+DROP INDEX IF EXISTS server_capability_last_updated_idx;
+DROP INDEX IF EXISTS server_server_capability_last_updated_idx;
+DROP INDEX IF EXISTS deliveryservices_required_capability_last_updated_idx;
\ No newline at end of file
diff --git a/traffic_ops/app/db/seeds.sql b/traffic_ops/app/db/seeds.sql
index fb940f4..f0519016 100644
--- a/traffic_ops/app/db/seeds.sql
+++ b/traffic_ops/app/db/seeds.sql
@@ -884,3 +884,57 @@ insert into to_extension (id, name, servercheck_short_name, servercheck_column_n
values (30, 'OPEN', '', 'bd', '1.0.0', '-', '', '0', '', (select id from type where name='CHECK_EXTENSION_OPEN_SLOT')) ON CONFLICT DO NOTHING;
insert into to_extension (id, name, servercheck_short_name, servercheck_column_name, version, info_url, script_file, isactive, additional_config_json, type)
values (31, 'OPEN', '', 'be', '1.0.0', '-', '', '0', '', (select id from type where name='CHECK_EXTENSION_OPEN_SLOT')) ON CONFLICT DO NOTHING;
+
+insert into last_deleted (table_name) VALUES ('api_capability');
+insert into last_deleted (table_name) VALUES ('asn');
+insert into last_deleted (table_name) VALUES ('cachegroup');
+insert into last_deleted (table_name) VALUES ('cachegroup_fallbacks');
+insert into last_deleted (table_name) VALUES ('cachegroup_localization_method');
+insert into last_deleted (table_name) VALUES ('cachegroup_parameter');
+insert into last_deleted (table_name) VALUES ('capability');
+insert into last_deleted (table_name) VALUES ('cdn');
+insert into last_deleted (table_name) VALUES ('coordinate');
+insert into last_deleted (table_name) VALUES ('deliveryservice');
+insert into last_deleted (table_name) VALUES ('deliveryservice_regex');
+insert into last_deleted (table_name) VALUES ('deliveryservice_request');
+insert into last_deleted (table_name) VALUES ('deliveryservice_request_comment');
+insert into last_deleted (table_name) VALUES ('deliveryservice_server');
+insert into last_deleted (table_name) VALUES ('deliveryservice_tmuser');
+insert into last_deleted (table_name) VALUES ('division');
+insert into last_deleted (table_name) VALUES ('federation');
+insert into last_deleted (table_name) VALUES ('federation_deliveryservice');
+insert into last_deleted (table_name) VALUES ('federation_federation_resolver');
+insert into last_deleted (table_name) VALUES ('federation_resolver');
+insert into last_deleted (table_name) VALUES ('federation_tmuser');
+insert into last_deleted (table_name) VALUES ('hwinfo');
+insert into last_deleted (table_name) VALUES ('job');
+insert into last_deleted (table_name) VALUES ('job_agent');
+insert into last_deleted (table_name) VALUES ('job_status');
+insert into last_deleted (table_name) VALUES ('log');
+insert into last_deleted (table_name) VALUES ('origin');
+insert into last_deleted (table_name) VALUES ('parameter');
+insert into last_deleted (table_name) VALUES ('phys_location');
+insert into last_deleted (table_name) VALUES ('profile');
+insert into last_deleted (table_name) VALUES ('profile_parameter');
+insert into last_deleted (table_name) VALUES ('regex');
+insert into last_deleted (table_name) VALUES ('region');
+insert into last_deleted (table_name) VALUES ('role');
+insert into last_deleted (table_name) VALUES ('role_capability');
+insert into last_deleted (table_name) VALUES ('server');
+insert into last_deleted (table_name) VALUES ('servercheck');
+insert into last_deleted (table_name) VALUES ('snapshot');
+insert into last_deleted (table_name) VALUES ('staticdnsentry');
+insert into last_deleted (table_name) VALUES ('stats_summary');
+insert into last_deleted (table_name) VALUES ('status');
+insert into last_deleted (table_name) VALUES ('steering_target');
+insert into last_deleted (table_name) VALUES ('tenant');
+insert into last_deleted (table_name) VALUES ('tm_user');
+insert into last_deleted (table_name) VALUES ('topology');
+insert into last_deleted (table_name) VALUES ('topology_cachegroup');
+insert into last_deleted (table_name) VALUES ('topology_cachegroup_parents');
+insert into last_deleted (table_name) VALUES ('to_extension');
+insert into last_deleted (table_name) VALUES ('type');
+insert into last_deleted (table_name) VALUES ('user_role');
+insert into last_deleted (table_name) VALUES ('server_capability');
+insert into last_deleted (table_name) VALUES ('server_server_capability');
+insert into last_deleted (table_name) VALUES ('deliveryservices_required_capability');
\ No newline at end of file
diff --git a/traffic_ops/client/about.go b/traffic_ops/client/about.go
index cf1e407..b1c2d09 100644
--- a/traffic_ops/client/about.go
+++ b/traffic_ops/client/about.go
@@ -27,7 +27,7 @@ const (
// GetAbout gets data about the TO instance.
func (to *Session) GetAbout() (map[string]string, ReqInf, error) {
route := API_ABOUT
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
diff --git a/traffic_ops/client/api_capability.go b/traffic_ops/client/api_capability.go
index 81c3eb7..fcb081e 100644
--- a/traffic_ops/client/api_capability.go
+++ b/traffic_ops/client/api_capability.go
@@ -46,7 +46,7 @@ func (to *Session) GetAPICapabilities(capability string, order string) (tc.APICa
path = fmt.Sprintf("%s?%s", path, vals.Encode())
}
- httpResp, remoteAddr, err := to.request(http.MethodGet, path, nil)
+ httpResp, remoteAddr, err := to.request(http.MethodGet, path, nil, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
diff --git a/traffic_ops/client/asn.go b/traffic_ops/client/asn.go
index 7162eee..8aa4f51 100644
--- a/traffic_ops/client/asn.go
+++ b/traffic_ops/client/asn.go
@@ -37,7 +37,7 @@ func (to *Session) CreateASN(entity tc.ASN) (tc.Alerts, ReqInf, error) {
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_ASNS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_ASNS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -57,7 +57,7 @@ func (to *Session) UpdateASNByID(id int, entity tc.ASN) (tc.Alerts, ReqInf, erro
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_ASNS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -69,7 +69,7 @@ func (to *Session) UpdateASNByID(id int, entity tc.ASN) (tc.Alerts, ReqInf, erro
// Returns a list of ASNs
func (to *Session) GetASNs() ([]tc.ASN, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_ASNS, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, API_ASNS, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -84,7 +84,7 @@ func (to *Session) GetASNs() ([]tc.ASN, ReqInf, error) {
// GET a ASN by the id
func (to *Session) GetASNByID(id int) ([]tc.ASN, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_ASNS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -102,7 +102,7 @@ func (to *Session) GetASNByID(id int) ([]tc.ASN, ReqInf, error) {
// GET an ASN by the asn number
func (to *Session) GetASNByASN(asn int) ([]tc.ASN, ReqInf, error) {
url := fmt.Sprintf("%s?asn=%d", API_ASNS, asn)
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -120,7 +120,7 @@ func (to *Session) GetASNByASN(asn int) ([]tc.ASN, ReqInf, error) {
// DELETE an ASN by asn number
func (to *Session) DeleteASNByASN(asn int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/asn/%d", API_ASNS, asn)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/cachegroup.go b/traffic_ops/client/cachegroup.go
index be2d5c5..260ffa6 100644
--- a/traffic_ops/client/cachegroup.go
+++ b/traffic_ops/client/cachegroup.go
@@ -35,7 +35,7 @@ const (
// Create a CacheGroup.
func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*tc.CacheGroupDetailResponse, ReqInf, error) {
if cachegroup.TypeID == nil && cachegroup.Type != nil {
- ty, _, err := to.GetTypeByName(*cachegroup.Type)
+ ty, _, err := to.GetTypeByName(*cachegroup.Type, nil)
if err != nil {
return nil, ReqInf{}, err
}
@@ -46,7 +46,7 @@ func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*
}
if cachegroup.ParentCachegroupID == nil && cachegroup.ParentName != nil {
- p, _, err := to.GetCacheGroupNullableByName(*cachegroup.ParentName)
+ p, _, err := to.GetCacheGroupNullableByName(*cachegroup.ParentName, nil)
if err != nil {
return nil, ReqInf{}, err
}
@@ -57,7 +57,7 @@ func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*
}
if cachegroup.SecondaryParentCachegroupID == nil && cachegroup.SecondaryParentName != nil {
- p, _, err := to.GetCacheGroupNullableByName(*cachegroup.SecondaryParentName)
+ p, _, err := to.GetCacheGroupNullableByName(*cachegroup.SecondaryParentName, nil)
if err != nil {
return nil, ReqInf{}, err
}
@@ -71,8 +71,11 @@ func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*
if err != nil {
return nil, ReqInf{}, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_CACHEGROUPS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_CACHEGROUPS, reqBody, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ }
if err != nil {
return nil, reqInf, err
}
@@ -94,7 +97,7 @@ func (to *Session) UpdateCacheGroupNullableByID(id int, cachegroup tc.CacheGroup
return nil, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_CACHEGROUPS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return nil, reqInf, err
}
@@ -107,8 +110,8 @@ func (to *Session) UpdateCacheGroupNullableByID(id int, cachegroup tc.CacheGroup
}
// Returns a list of CacheGroups.
-func (to *Session) GetCacheGroupsNullable() ([]tc.CacheGroupNullable, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_CACHEGROUPS, nil)
+func (to *Session) GetCacheGroupsNullable(header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_CACHEGROUPS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -123,9 +126,9 @@ func (to *Session) GetCacheGroupsNullable() ([]tc.CacheGroupNullable, ReqInf, er
}
// GET a CacheGroup by the CacheGroup ID.
-func (to *Session) GetCacheGroupNullableByID(id int) ([]tc.CacheGroupNullable, ReqInf, error) {
+func (to *Session) GetCacheGroupNullableByID(id int, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
route := fmt.Sprintf("%s?id=%v", API_CACHEGROUPS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -141,10 +144,16 @@ func (to *Session) GetCacheGroupNullableByID(id int) ([]tc.CacheGroupNullable, R
}
// GET a CacheGroup by the CacheGroup name.
-func (to *Session) GetCacheGroupNullableByName(name string) ([]tc.CacheGroupNullable, ReqInf, error) {
+func (to *Session) GetCacheGroupNullableByName(name string, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
route := fmt.Sprintf("%s?name=%s", API_CACHEGROUPS, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.CacheGroupNullable{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -159,10 +168,16 @@ func (to *Session) GetCacheGroupNullableByName(name string) ([]tc.CacheGroupNull
}
// GET a CacheGroup by the CacheGroup short name.
-func (to *Session) GetCacheGroupNullableByShortName(shortName string) ([]tc.CacheGroupNullable, ReqInf, error) {
+func (to *Session) GetCacheGroupNullableByShortName(shortName string, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
route := fmt.Sprintf("%s?shortName=%s", API_CACHEGROUPS, url.QueryEscape(shortName))
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.CacheGroupNullable{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -179,7 +194,7 @@ func (to *Session) GetCacheGroupNullableByShortName(shortName string) ([]tc.Cach
// DELETE a CacheGroup by ID.
func (to *Session) DeleteCacheGroupByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_CACHEGROUPS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -193,14 +208,20 @@ func (to *Session) DeleteCacheGroupByID(id int) (tc.Alerts, ReqInf, error) {
}
// GetCacheGroupsByQueryParams gets cache groups by the given query parameters.
-func (to *Session) GetCacheGroupsByQueryParams(qparams url.Values) ([]tc.CacheGroupNullable, ReqInf, error) {
+func (to *Session) GetCacheGroupsByQueryParams(qparams url.Values, header http.Header) ([]tc.CacheGroupNullable, ReqInf, error) {
route := API_CACHEGROUPS
if len(qparams) > 0 {
route += "?" + qparams.Encode()
}
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.CacheGroupNullable{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -221,7 +242,7 @@ func (to *Session) SetCachegroupDeliveryServices(cgID int, dsIDs []int) (tc.Cach
if err != nil {
return tc.CacheGroupPostDSRespResponse{}, ReqInf{}, err
}
- reqResp, remoteAddr, err := to.request(http.MethodPost, uri, reqBody)
+ reqResp, remoteAddr, err := to.request(http.MethodPost, uri, reqBody, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if reqResp != nil {
reqInf.StatusCode = reqResp.StatusCode
diff --git a/traffic_ops/client/cachegroup_parameters.go b/traffic_ops/client/cachegroup_parameters.go
index 8dc7930..fe26fa7 100644
--- a/traffic_ops/client/cachegroup_parameters.go
+++ b/traffic_ops/client/cachegroup_parameters.go
@@ -28,21 +28,27 @@ const (
)
// GetCacheGroupParameters Gets a Cache Group's Parameters
-func (to *Session) GetCacheGroupParameters(cacheGroupID int) ([]tc.CacheGroupParameter, ReqInf, error) {
+func (to *Session) GetCacheGroupParameters(cacheGroupID int, header http.Header) ([]tc.CacheGroupParameter, ReqInf, error) {
route := fmt.Sprintf("%s/%d/parameters", API_CACHEGROUPS, cacheGroupID)
- return to.getCacheGroupParameters(route, "")
+ return to.getCacheGroupParameters(route, "", header)
}
// GetCacheGroupParametersByQueryParams Gets a Cache Group's Parameters with query parameters
-func (to *Session) GetCacheGroupParametersByQueryParams(cacheGroupID int, queryParams string) ([]tc.CacheGroupParameter, ReqInf, error) {
+func (to *Session) GetCacheGroupParametersByQueryParams(cacheGroupID int, queryParams string, header http.Header) ([]tc.CacheGroupParameter, ReqInf, error) {
route := fmt.Sprintf("%s/%d/parameters", API_CACHEGROUPS, cacheGroupID)
- return to.getCacheGroupParameters(route, queryParams)
+ return to.getCacheGroupParameters(route, queryParams, header)
}
-func (to *Session) getCacheGroupParameters(route, queryParams string) ([]tc.CacheGroupParameter, ReqInf, error) {
+func (to *Session) getCacheGroupParameters(route, queryParams string, header http.Header) ([]tc.CacheGroupParameter, ReqInf, error) {
r := fmt.Sprintf("%s%s", route, queryParams)
- resp, remoteAddr, err := to.request(http.MethodGet, r, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, r, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.CacheGroupParameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -56,9 +62,9 @@ func (to *Session) getCacheGroupParameters(route, queryParams string) ([]tc.Cach
}
// GetAllCacheGroupParameters Gets all Cachegroup Parameter associations
-func (to *Session) GetAllCacheGroupParameters() ([]tc.CacheGroupParametersResponseNullable, ReqInf, error) {
+func (to *Session) GetAllCacheGroupParameters(header http.Header) ([]tc.CacheGroupParametersResponseNullable, ReqInf, error) {
route := fmt.Sprintf("%s/", API_CACHEGROUPPARAMETERS)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -75,7 +81,7 @@ func (to *Session) GetAllCacheGroupParameters() ([]tc.CacheGroupParametersRespon
// DeleteCacheGroupParameter Deassociates a Parameter with a Cache Group
func (to *Session) DeleteCacheGroupParameter(cacheGroupID, parameterID int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d/%d", API_CACHEGROUPPARAMETERS, cacheGroupID, parameterID)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -99,7 +105,7 @@ func (to *Session) CreateCacheGroupParameter(cacheGroupID, parameterID int) (*tc
if err != nil {
return nil, ReqInf{}, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_CACHEGROUPPARAMETERS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_CACHEGROUPPARAMETERS, reqBody, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
diff --git a/traffic_ops/client/capability.go b/traffic_ops/client/capability.go
index 43bae24..04f37ef 100644
--- a/traffic_ops/client/capability.go
+++ b/traffic_ops/client/capability.go
@@ -24,9 +24,15 @@ import "github.com/apache/trafficcontrol/lib/go-tc"
const API_CAPABILITIES = apiBase + "/capabilities"
// GetCapabilities retrieves all capabilities.
-func (to *Session) GetCapabilities() ([]tc.Capability, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_CAPABILITIES, nil)
+func (to *Session) GetCapabilities(header http.Header) ([]tc.Capability, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_CAPABILITIES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Capability{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -38,12 +44,18 @@ func (to *Session) GetCapabilities() ([]tc.Capability, ReqInf, error) {
}
// GetCapability retrieves only the capability named 'c'.
-func (to *Session) GetCapability(c string) (tc.Capability, ReqInf, error) {
+func (to *Session) GetCapability(c string, header http.Header) (tc.Capability, ReqInf, error) {
v := url.Values{}
v.Add("name", c)
endpoint := API_CAPABILITIES + "?" + v.Encode()
- resp, remoteAddr, err := to.request(http.MethodGet, endpoint, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, endpoint, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return tc.Capability{}, reqInf, nil
+ }
+ }
if err != nil {
return tc.Capability{}, reqInf, err
}
diff --git a/traffic_ops/client/cdn.go b/traffic_ops/client/cdn.go
index ad30062..ede4b3f 100644
--- a/traffic_ops/client/cdn.go
+++ b/traffic_ops/client/cdn.go
@@ -38,7 +38,7 @@ func (to *Session) CreateCDN(cdn tc.CDN) (tc.Alerts, ReqInf, error) {
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_CDNS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_CDNS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -58,7 +58,7 @@ func (to *Session) UpdateCDNByID(id int, cdn tc.CDN) (tc.Alerts, ReqInf, error)
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_CDNS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -69,9 +69,15 @@ func (to *Session) UpdateCDNByID(id int, cdn tc.CDN) (tc.Alerts, ReqInf, error)
}
// GetCDNs eturns a list of CDNs.
-func (to *Session) GetCDNs() ([]tc.CDN, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_CDNS, nil)
+func (to *Session) GetCDNs(header http.Header) ([]tc.CDN, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_CDNS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.CDN{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -83,10 +89,16 @@ func (to *Session) GetCDNs() ([]tc.CDN, ReqInf, error) {
}
// GetCDNByID a CDN by the CDN ID.
-func (to *Session) GetCDNByID(id int) ([]tc.CDN, ReqInf, error) {
+func (to *Session) GetCDNByID(id int, header http.Header) ([]tc.CDN, ReqInf, error) {
route := fmt.Sprintf("%s?id=%v", API_CDNS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.CDN{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -101,10 +113,16 @@ func (to *Session) GetCDNByID(id int) ([]tc.CDN, ReqInf, error) {
}
// GetCDNByName gets a CDN by the CDN name.
-func (to *Session) GetCDNByName(name string) ([]tc.CDN, ReqInf, error) {
+func (to *Session) GetCDNByName(name string, header http.Header) ([]tc.CDN, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_CDNS, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.CDN{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -121,7 +139,7 @@ func (to *Session) GetCDNByName(name string) ([]tc.CDN, ReqInf, error) {
// DeleteCDNByID deletes a CDN by ID.
func (to *Session) DeleteCDNByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_CDNS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -132,10 +150,16 @@ func (to *Session) DeleteCDNByID(id int) (tc.Alerts, ReqInf, error) {
return alerts, reqInf, nil
}
-func (to *Session) GetCDNSSLKeys(name string) ([]tc.CDNSSLKeys, ReqInf, error) {
+func (to *Session) GetCDNSSLKeys(name string, header http.Header) ([]tc.CDNSSLKeys, ReqInf, error) {
url := fmt.Sprintf("%s/name/%s/sslkeys", API_CDNS, name)
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.CDNSSLKeys{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
diff --git a/traffic_ops/client/cdn_domains.go b/traffic_ops/client/cdn_domains.go
index 5e73db9..a3f84bc 100644
--- a/traffic_ops/client/cdn_domains.go
+++ b/traffic_ops/client/cdn_domains.go
@@ -2,6 +2,7 @@ package client
import (
"github.com/apache/trafficcontrol/lib/go-tc"
+ "net/http"
)
/*
@@ -19,9 +20,9 @@ import (
limitations under the License.
*/
-func (to *Session) GetDomains() ([]tc.Domain, ReqInf, error) {
+func (to *Session) GetDomains(header http.Header) ([]tc.Domain, ReqInf, error) {
var data tc.DomainsResponse
- inf, err := get(to, apiBase+"/cdns/domains", &data)
+ inf, err := get(to, apiBase+"/cdns/domains", &data, header)
if err != nil {
return nil, inf, err
}
diff --git a/traffic_ops/client/cdnfederations.go b/traffic_ops/client/cdnfederations.go
index 1e8c732..e276e02 100644
--- a/traffic_ops/client/cdnfederations.go
+++ b/traffic_ops/client/cdnfederations.go
@@ -18,6 +18,7 @@ package client
import (
"encoding/json"
"fmt"
+ "net/http"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -35,21 +36,21 @@ func (to *Session) CreateCDNFederationByName(f tc.CDNFederation, CDNName string)
data := tc.CreateCDNFederationResponse{}
url := fmt.Sprintf("%s/cdns/%s/federations", apiBase, CDNName)
- inf, err := makeReq(to, "POST", url, jsonReq, &data)
+ inf, err := makeReq(to, "POST", url, jsonReq, &data, nil)
return &data, inf, err
}
-func (to *Session) GetCDNFederationsByName(CDNName string) (*tc.CDNFederationResponse, ReqInf, error) {
+func (to *Session) GetCDNFederationsByName(CDNName string, header http.Header) (*tc.CDNFederationResponse, ReqInf, error) {
data := tc.CDNFederationResponse{}
url := fmt.Sprintf("%s/cdns/%s/federations", apiBase, CDNName)
- inf, err := get(to, url, &data)
+ inf, err := get(to, url, &data, header)
return &data, inf, err
}
-func (to *Session) GetCDNFederationsByID(CDNName string, ID int) (*tc.CDNFederationResponse, ReqInf, error) {
+func (to *Session) GetCDNFederationsByID(CDNName string, ID int, header http.Header) (*tc.CDNFederationResponse, ReqInf, error) {
data := tc.CDNFederationResponse{}
url := fmt.Sprintf("%s/cdns/%s/federations?id=%v", apiBase, CDNName, ID)
- inf, err := get(to, url, &data)
+ inf, err := get(to, url, &data, header)
return &data, inf, err
}
@@ -61,13 +62,13 @@ func (to *Session) UpdateCDNFederationsByID(f tc.CDNFederation, CDNName string,
data := tc.UpdateCDNFederationResponse{}
url := fmt.Sprintf("%s/cdns/%s/federations/%d", apiBase, CDNName, ID)
- inf, err := makeReq(to, "PUT", url, jsonReq, &data)
+ inf, err := makeReq(to, "PUT", url, jsonReq, &data, nil)
return &data, inf, err
}
func (to *Session) DeleteCDNFederationByID(CDNName string, ID int) (*tc.DeleteCDNFederationResponse, ReqInf, error) {
data := tc.DeleteCDNFederationResponse{}
url := fmt.Sprintf("%s/cdns/%s/federations/%d", apiBase, CDNName, ID)
- inf, err := makeReq(to, "DELETE", url, nil, &data)
+ inf, err := makeReq(to, "DELETE", url, nil, &data, nil)
return &data, inf, err
}
diff --git a/traffic_ops/client/coordinate.go b/traffic_ops/client/coordinate.go
index 223219c..2e65988 100644
--- a/traffic_ops/client/coordinate.go
+++ b/traffic_ops/client/coordinate.go
@@ -37,7 +37,7 @@ func (to *Session) CreateCoordinate(coordinate tc.Coordinate) (tc.Alerts, ReqInf
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_COORDINATES, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_COORDINATES, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -57,7 +57,7 @@ func (to *Session) UpdateCoordinateByID(id int, coordinate tc.Coordinate) (tc.Al
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s?id=%d", API_COORDINATES, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -68,9 +68,15 @@ func (to *Session) UpdateCoordinateByID(id int, coordinate tc.Coordinate) (tc.Al
}
// Returns a list of Coordinates
-func (to *Session) GetCoordinates() ([]tc.Coordinate, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_COORDINATES, nil)
+func (to *Session) GetCoordinates(header http.Header) ([]tc.Coordinate, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_COORDINATES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Coordinate{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -82,10 +88,16 @@ func (to *Session) GetCoordinates() ([]tc.Coordinate, ReqInf, error) {
}
// GET a Coordinate by the Coordinate id
-func (to *Session) GetCoordinateByID(id int) ([]tc.Coordinate, ReqInf, error) {
+func (to *Session) GetCoordinateByID(id int, header http.Header) ([]tc.Coordinate, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_COORDINATES, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Coordinate{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -100,10 +112,16 @@ func (to *Session) GetCoordinateByID(id int) ([]tc.Coordinate, ReqInf, error) {
}
// GET a Coordinate by the Coordinate name
-func (to *Session) GetCoordinateByName(name string) ([]tc.Coordinate, ReqInf, error) {
+func (to *Session) GetCoordinateByName(name string, header http.Header) ([]tc.Coordinate, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_COORDINATES, name)
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Coordinate{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -120,7 +138,7 @@ func (to *Session) GetCoordinateByName(name string) ([]tc.Coordinate, ReqInf, er
// DELETE a Coordinate by ID
func (to *Session) DeleteCoordinateByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_COORDINATES, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/crconfig.go b/traffic_ops/client/crconfig.go
index 8260507..e02eb05 100644
--- a/traffic_ops/client/crconfig.go
+++ b/traffic_ops/client/crconfig.go
@@ -49,7 +49,7 @@ func (to *Session) GetCRConfig(cdn string) ([]byte, ReqInf, error) {
// SnapshotCRConfig snapshots a CDN by name.
func (to *Session) SnapshotCRConfig(cdn string) (ReqInf, error) {
uri := fmt.Sprintf("%s?cdn=%s", API_SNAPSHOT, url.QueryEscape(cdn))
- _, remoteAddr, err := to.request(http.MethodPut, uri, nil)
+ _, remoteAddr, err := to.request(http.MethodPut, uri, nil, nil)
reqInf := ReqInf{RemoteAddr: remoteAddr, CacheHitStatus: CacheHitStatusMiss}
return reqInf, err
}
@@ -57,7 +57,7 @@ func (to *Session) SnapshotCRConfig(cdn string) (ReqInf, error) {
// SnapshotCDNByID snapshots a CDN by ID.
func (to *Session) SnapshotCRConfigByID(id int) (tc.Alerts, ReqInf, error) {
url := fmt.Sprintf("%s?cdnID=%d", API_SNAPSHOT, id)
- resp, remoteAddr, err := to.request(http.MethodPut, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodPut, url, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/deliveryservice.go b/traffic_ops/client/deliveryservice.go
index 5cd866d..73195a1 100644
--- a/traffic_ops/client/deliveryservice.go
+++ b/traffic_ops/client/deliveryservice.go
@@ -19,6 +19,7 @@ import (
"encoding/json"
"errors"
"fmt"
+ "net/http"
"strconv"
"github.com/apache/trafficcontrol/lib/go-tc"
@@ -115,7 +116,7 @@ const (
func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryServiceNullable, ReqInf, error) {
var data tc.DeliveryServicesNullableResponse
- reqInf, err := get(to, fmt.Sprintf(API_SERVER_DELIVERY_SERVICES, id), &data)
+ reqInf, err := get(to, fmt.Sprintf(API_SERVER_DELIVERY_SERVICES, id), &data, nil)
if err != nil {
return nil, reqInf, err
}
@@ -124,11 +125,11 @@ func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryServiceNull
}
// GetDeliveryServicesNullable returns a slice of Delivery Services.
-func (to *Session) GetDeliveryServicesNullable() ([]tc.DeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetDeliveryServicesNullable(header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
data := struct {
Response []tc.DeliveryServiceNullable `json:"response"`
}{}
- reqInf, err := get(to, API_DELIVERY_SERVICES, &data)
+ reqInf, err := get(to, API_DELIVERY_SERVICES, &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -137,11 +138,11 @@ func (to *Session) GetDeliveryServicesNullable() ([]tc.DeliveryServiceNullable,
// GetDeliveryServicesByCDNID returns the (tenant-visible) Delivery Services within the CDN identified
// by the integral, unique identifier 'cdnID'.
-func (to *Session) GetDeliveryServicesByCDNID(cdnID int) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetDeliveryServicesByCDNID(cdnID int, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
data := struct {
Response []tc.DeliveryServiceNullable `json:"response"`
}{}
- reqInf, err := get(to, API_DELIVERY_SERVICES+"?cdn="+strconv.Itoa(cdnID), &data)
+ reqInf, err := get(to, API_DELIVERY_SERVICES+"?cdn="+strconv.Itoa(cdnID), &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -150,11 +151,11 @@ func (to *Session) GetDeliveryServicesByCDNID(cdnID int) ([]tc.DeliveryServiceNu
// GetDeliveryServiceNullable returns the Delivery Service identified by the integral, unique identifier
// 'id' (which must be passed as a string).
-func (to *Session) GetDeliveryServiceNullable(id string) (*tc.DeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetDeliveryServiceNullable(id string, header http.Header) (*tc.DeliveryServiceNullable, ReqInf, error) {
data := struct {
Response []tc.DeliveryServiceNullable `json:"response"`
}{}
- reqInf, err := get(to, API_DELIVERY_SERVICES+"?id="+id, &data)
+ reqInf, err := get(to, API_DELIVERY_SERVICES+"?id="+id, &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -167,9 +168,9 @@ func (to *Session) GetDeliveryServiceNullable(id string) (*tc.DeliveryServiceNul
// GetDeliveryServiceByXMLIDNullable returns the Delivery Service identified by the passed XMLID.
// The length of the returned slice should always be 1 when the request is succesful - if it isn't
// something very wicked has happened to Traffic Ops.
-func (to *Session) GetDeliveryServiceByXMLIDNullable(XMLID string) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetDeliveryServiceByXMLIDNullable(XMLID string, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
var data tc.DeliveryServicesNullableResponse
- reqInf, err := get(to, API_DELIVERY_SERVICES+"?xmlId="+XMLID, &data)
+ reqInf, err := get(to, API_DELIVERY_SERVICES+"?xmlId="+XMLID, &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -180,7 +181,7 @@ func (to *Session) GetDeliveryServiceByXMLIDNullable(XMLID string) ([]tc.Deliver
// CreateDeliveryServiceNullable creates the DeliveryService it's passed.
func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable) (*tc.CreateDeliveryServiceNullableResponse, error) {
if ds.TypeID == nil && ds.Type != nil {
- ty, _, err := to.GetTypeByName(ds.Type.String())
+ ty, _, err := to.GetTypeByName(ds.Type.String(), nil)
if err != nil {
return nil, err
}
@@ -191,7 +192,7 @@ func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable)
}
if ds.CDNID == nil && ds.CDNName != nil {
- cdns, _, err := to.GetCDNByName(*ds.CDNName)
+ cdns, _, err := to.GetCDNByName(*ds.CDNName, nil)
if err != nil {
return nil, err
}
@@ -202,7 +203,7 @@ func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable)
}
if ds.ProfileID == nil && ds.ProfileName != nil {
- profiles, _, err := to.GetProfileByName(*ds.ProfileName)
+ profiles, _, err := to.GetProfileByName(*ds.ProfileName, nil)
if err != nil {
return nil, err
}
@@ -213,7 +214,7 @@ func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable)
}
if ds.TenantID == nil && ds.Tenant != nil {
- ten, _, err := to.TenantByName(*ds.Tenant)
+ ten, _, err := to.TenantByName(*ds.Tenant, nil)
if err != nil {
return nil, err
}
@@ -262,9 +263,9 @@ func (to *Session) DeleteDeliveryService(id string) (*tc.DeleteDeliveryServiceRe
// GetDeliveryServiceHealth gets the 'health' of the Delivery Service identified by the
// integral, unique identifier 'id' (which must be passed as a string).
-func (to *Session) GetDeliveryServiceHealth(id string) (*tc.DeliveryServiceHealth, ReqInf, error) {
+func (to *Session) GetDeliveryServiceHealth(id string, header http.Header) (*tc.DeliveryServiceHealth, ReqInf, error) {
var data tc.DeliveryServiceHealthResponse
- reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_HEALTH, id), &data)
+ reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_HEALTH, id), &data, nil)
if err != nil {
return nil, reqInf, err
}
@@ -274,9 +275,9 @@ func (to *Session) GetDeliveryServiceHealth(id string) (*tc.DeliveryServiceHealt
// GetDeliveryServiceCapacity gets the 'capacity' of the Delivery Service identified by the
// integral, unique identifier 'id' (which must be passed as a string).
-func (to *Session) GetDeliveryServiceCapacity(id string) (*tc.DeliveryServiceCapacity, ReqInf, error) {
+func (to *Session) GetDeliveryServiceCapacity(id string, header http.Header) (*tc.DeliveryServiceCapacity, ReqInf, error) {
var data tc.DeliveryServiceCapacityResponse
- reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_CAPACITY, id), &data)
+ reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_CAPACITY, id), &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -286,9 +287,9 @@ func (to *Session) GetDeliveryServiceCapacity(id string) (*tc.DeliveryServiceCap
// GetDeliveryServiceServer returns associations between Delivery Services and servers using the
// provided pagination controls.
-func (to *Session) GetDeliveryServiceServer(page, limit string) ([]tc.DeliveryServiceServer, ReqInf, error) {
+func (to *Session) GetDeliveryServiceServer(page, limit string, header http.Header) ([]tc.DeliveryServiceServer, ReqInf, error) {
var data tc.DeliveryServiceServerResponse
- reqInf, err := get(to, API_DELIVERY_SERVICE_SERVER+"?page="+page+"&limit="+limit, &data)
+ reqInf, err := get(to, API_DELIVERY_SERVICE_SERVER+"?page="+page+"&limit="+limit, &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -298,9 +299,9 @@ func (to *Session) GetDeliveryServiceServer(page, limit string) ([]tc.DeliverySe
// GetDeliveryServiceRegexes returns the "Regexes" (Regular Expressions) used by all (tenant-visible)
// Delivery Services.
-func (to *Session) GetDeliveryServiceRegexes() ([]tc.DeliveryServiceRegexes, ReqInf, error) {
+func (to *Session) GetDeliveryServiceRegexes(header http.Header) ([]tc.DeliveryServiceRegexes, ReqInf, error) {
var data tc.DeliveryServiceRegexResponse
- reqInf, err := get(to, API_DELIVERY_SERVICES_REGEXES, &data)
+ reqInf, err := get(to, API_DELIVERY_SERVICES_REGEXES, &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -310,9 +311,9 @@ func (to *Session) GetDeliveryServiceRegexes() ([]tc.DeliveryServiceRegexes, Req
// GetDeliveryServiceSSLKeysByID returns information about the SSL Keys used by the Delivery
// Service identified by the passed XMLID.
-func (to *Session) GetDeliveryServiceSSLKeysByID(XMLID string) (*tc.DeliveryServiceSSLKeys, ReqInf, error) {
+func (to *Session) GetDeliveryServiceSSLKeysByID(XMLID string, header http.Header) (*tc.DeliveryServiceSSLKeys, ReqInf, error) {
var data tc.DeliveryServiceSSLKeysResponse
- reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_XMLID_SSL_KEYS, XMLID), &data)
+ reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_XMLID_SSL_KEYS, XMLID), &data, header)
if err != nil {
return nil, reqInf, err
}
@@ -322,12 +323,12 @@ func (to *Session) GetDeliveryServiceSSLKeysByID(XMLID string) (*tc.DeliveryServ
// GetDeliveryServicesEligible returns the servers eligible for assignment to the Delivery
// Service identified by the integral, unique identifier 'dsID'.
-func (to *Session) GetDeliveryServicesEligible(dsID int) ([]tc.DSServer, ReqInf, error) {
+func (to *Session) GetDeliveryServicesEligible(dsID int, header http.Header) ([]tc.DSServer, ReqInf, error) {
resp := struct {
Response []tc.DSServer `json:"response"`
}{Response: []tc.DSServer{}}
- reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_ELIGIBLE_SERVERS, dsID), &resp)
+ reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICE_ELIGIBLE_SERVERS, dsID), &resp, header)
if err != nil {
return nil, reqInf, err
}
@@ -336,12 +337,12 @@ func (to *Session) GetDeliveryServicesEligible(dsID int) ([]tc.DSServer, ReqInf,
// GetDeliveryServiceURLSigKeys returns the URL-signing keys used by the Delivery Service
// identified by the XMLID 'dsName'.
-func (to *Session) GetDeliveryServiceURLSigKeys(dsName string) (tc.URLSigKeys, ReqInf, error) {
+func (to *Session) GetDeliveryServiceURLSigKeys(dsName string, header http.Header) (tc.URLSigKeys, ReqInf, error) {
data := struct {
Response tc.URLSigKeys `json:"response"`
}{}
- reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICES_URL_SIGNING_KEYS, dsName), &data)
+ reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICES_URL_SIGNING_KEYS, dsName), &data, header)
if err != nil {
return tc.URLSigKeys{}, reqInf, err
}
@@ -350,9 +351,9 @@ func (to *Session) GetDeliveryServiceURLSigKeys(dsName string) (tc.URLSigKeys, R
// GetDeliveryServiceURISigningKeys returns the URI-signing keys used by the Delivery Service
// identified by the XMLID 'dsName'. The result is not parsed.
-func (to *Session) GetDeliveryServiceURISigningKeys(dsName string) ([]byte, ReqInf, error) {
+func (to *Session) GetDeliveryServiceURISigningKeys(dsName string, header http.Header) ([]byte, ReqInf, error) {
data := json.RawMessage{}
- reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICES_URI_SIGNING_KEYS, dsName), &data)
+ reqInf, err := get(to, fmt.Sprintf(API_DELIVERY_SERVICES_URI_SIGNING_KEYS, dsName), &data, header)
if err != nil {
return []byte{}, reqInf, err
}
@@ -383,6 +384,6 @@ func (to *Session) UpdateDeliveryServiceSafe(id int, ds tc.DeliveryServiceSafeUp
// its children.
func (to *Session) GetAccessibleDeliveryServicesByTenant(tenantId int) ([]tc.DeliveryServiceNullable, ReqInf, error) {
data := tc.DeliveryServicesNullableResponse{}
- reqInf, err := get(to, fmt.Sprintf("%v?accessibleTo=%v", API_DELIVERY_SERVICES, tenantId), &data)
+ reqInf, err := get(to, fmt.Sprintf("%v?accessibleTo=%v", API_DELIVERY_SERVICES, tenantId), &data, nil)
return data.Response, reqInf, err
}
diff --git a/traffic_ops/client/deliveryservice_regexes.go b/traffic_ops/client/deliveryservice_regexes.go
index 07946cf..d9dbd42 100644
--- a/traffic_ops/client/deliveryservice_regexes.go
+++ b/traffic_ops/client/deliveryservice_regexes.go
@@ -33,7 +33,7 @@ func (to *Session) GetDeliveryServiceRegexesByDSID(dsID int, params map[string]s
Response []tc.DeliveryServiceIDRegex `json:"response"`
}{}
- reqInf, err := get(to, fmt.Sprintf(API_DS_REGEXES, dsID)+mapToQueryParameters(params), &response)
+ reqInf, err := get(to, fmt.Sprintf(API_DS_REGEXES, dsID)+mapToQueryParameters(params), &response, nil)
if err != nil {
return []tc.DeliveryServiceIDRegex{}, reqInf, err
}
diff --git a/traffic_ops/client/deliveryservice_request_comments.go b/traffic_ops/client/deliveryservice_request_comments.go
index 231d77a..82b39cd 100644
--- a/traffic_ops/client/deliveryservice_request_comments.go
+++ b/traffic_ops/client/deliveryservice_request_comments.go
@@ -38,7 +38,7 @@ func (to *Session) CreateDeliveryServiceRequestComment(comment tc.DeliveryServic
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_DELIVERY_SERVICE_REQUEST_COMMENTS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_DELIVERY_SERVICE_REQUEST_COMMENTS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -58,7 +58,7 @@ func (to *Session) UpdateDeliveryServiceRequestCommentByID(id int, comment tc.De
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s?id=%d", API_DELIVERY_SERVICE_REQUEST_COMMENTS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -69,9 +69,15 @@ func (to *Session) UpdateDeliveryServiceRequestCommentByID(id int, comment tc.De
}
// Returns a list of delivery service request comments
-func (to *Session) GetDeliveryServiceRequestComments() ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_DELIVERY_SERVICE_REQUEST_COMMENTS, nil)
+func (to *Session) GetDeliveryServiceRequestComments(header http.Header) ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_DELIVERY_SERVICE_REQUEST_COMMENTS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.DeliveryServiceRequestComment{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -83,10 +89,16 @@ func (to *Session) GetDeliveryServiceRequestComments() ([]tc.DeliveryServiceRequ
}
// GET a delivery service request comment by ID
-func (to *Session) GetDeliveryServiceRequestCommentByID(id int) ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
+func (to *Session) GetDeliveryServiceRequestCommentByID(id int, header http.Header) ([]tc.DeliveryServiceRequestComment, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DELIVERY_SERVICE_REQUEST_COMMENTS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.DeliveryServiceRequestComment{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -103,7 +115,7 @@ func (to *Session) GetDeliveryServiceRequestCommentByID(id int) ([]tc.DeliverySe
// DELETE a delivery service request comment by ID
func (to *Session) DeleteDeliveryServiceRequestCommentByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DELIVERY_SERVICE_REQUEST_COMMENTS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/deliveryservice_requests.go b/traffic_ops/client/deliveryservice_requests.go
index d59536f..862536d 100644
--- a/traffic_ops/client/deliveryservice_requests.go
+++ b/traffic_ops/client/deliveryservice_requests.go
@@ -36,7 +36,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
var alerts tc.Alerts
var remoteAddr net.Addr
if dsr.AssigneeID == 0 && dsr.Assignee != "" {
- res, reqInf, err := to.GetUserByUsername(dsr.Assignee)
+ res, reqInf, err := to.GetUserByUsername(dsr.Assignee, nil)
if err != nil {
return alerts, reqInf, err
}
@@ -47,7 +47,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.AuthorID == 0 && dsr.Author != "" {
- res, reqInf, err := to.GetUserByUsername(dsr.Author)
+ res, reqInf, err := to.GetUserByUsername(dsr.Author, nil)
if err != nil {
return alerts, reqInf, err
}
@@ -58,7 +58,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.DeliveryService.TypeID == 0 && dsr.DeliveryService.Type.String() != "" {
- ty, reqInf, err := to.GetTypeByName(dsr.DeliveryService.Type.String())
+ ty, reqInf, err := to.GetTypeByName(dsr.DeliveryService.Type.String(), nil)
if err != nil || len(ty) == 0 {
return alerts, reqInf, errors.New("no type named " + dsr.DeliveryService.Type.String())
}
@@ -66,7 +66,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.DeliveryService.CDNID == 0 && dsr.DeliveryService.CDNName != "" {
- cdns, reqInf, err := to.GetCDNByName(dsr.DeliveryService.CDNName)
+ cdns, reqInf, err := to.GetCDNByName(dsr.DeliveryService.CDNName, nil)
if err != nil || len(cdns) == 0 {
return alerts, reqInf, errors.New("no CDN named " + dsr.DeliveryService.CDNName)
}
@@ -74,7 +74,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.DeliveryService.ProfileID == 0 && dsr.DeliveryService.ProfileName != "" {
- profiles, reqInf, err := to.GetProfileByName(dsr.DeliveryService.ProfileName)
+ profiles, reqInf, err := to.GetProfileByName(dsr.DeliveryService.ProfileName, nil)
if err != nil || len(profiles) == 0 {
return alerts, reqInf, errors.New("no Profile named " + dsr.DeliveryService.ProfileName)
}
@@ -82,7 +82,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
if dsr.DeliveryService.TenantID == 0 && dsr.DeliveryService.Tenant != "" {
- ten, reqInf, err := to.TenantByName(dsr.DeliveryService.Tenant)
+ ten, reqInf, err := to.TenantByName(dsr.DeliveryService.Tenant, nil)
if err != nil || ten == nil {
return alerts, reqInf, errors.New("no Tenant named " + dsr.DeliveryService.Tenant)
}
@@ -94,7 +94,7 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
if err != nil {
return alerts, reqInf, err
}
- resp, remoteAddr, err := to.RawRequest(http.MethodPost, API_DS_REQUESTS, reqBody)
+ resp, remoteAddr, err := to.RawRequest(http.MethodPost, API_DS_REQUESTS, reqBody, nil)
defer resp.Body.Close()
if err == nil {
@@ -111,10 +111,16 @@ func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (
}
// GetDeliveryServiceRequests retrieves all deliveryservices available to session user.
-func (to *Session) GetDeliveryServiceRequests() ([]tc.DeliveryServiceRequest, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_DS_REQUESTS, nil)
+func (to *Session) GetDeliveryServiceRequests(header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_DS_REQUESTS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.DeliveryServiceRequest{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -131,11 +137,17 @@ func (to *Session) GetDeliveryServiceRequests() ([]tc.DeliveryServiceRequest, Re
}
// GET a DeliveryServiceRequest by the DeliveryServiceRequest XMLID
-func (to *Session) GetDeliveryServiceRequestByXMLID(XMLID string) ([]tc.DeliveryServiceRequest, ReqInf, error) {
+func (to *Session) GetDeliveryServiceRequestByXMLID(XMLID string, header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
route := fmt.Sprintf("%s?xmlId=%s", API_DS_REQUESTS, url.QueryEscape(XMLID))
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.DeliveryServiceRequest{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -152,10 +164,16 @@ func (to *Session) GetDeliveryServiceRequestByXMLID(XMLID string) ([]tc.Delivery
}
// GET a DeliveryServiceRequest by the DeliveryServiceRequest id
-func (to *Session) GetDeliveryServiceRequestByID(id int) ([]tc.DeliveryServiceRequest, ReqInf, error) {
+func (to *Session) GetDeliveryServiceRequestByID(id int, header http.Header) ([]tc.DeliveryServiceRequest, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DS_REQUESTS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.DeliveryServiceRequest{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -182,7 +200,7 @@ func (to *Session) UpdateDeliveryServiceRequestByID(id int, dsr tc.DeliveryServi
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -195,7 +213,7 @@ func (to *Session) UpdateDeliveryServiceRequestByID(id int, dsr tc.DeliveryServi
// DELETE a DeliveryServiceRequest by DeliveryServiceRequest assignee
func (to *Session) DeleteDeliveryServiceRequestByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DS_REQUESTS, id)
- resp, remoteAddr, err := to.RawRequest(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.RawRequest(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/deliveryservices_required_capabilities.go b/traffic_ops/client/deliveryservices_required_capabilities.go
index 1a96410..163fe84 100644
--- a/traffic_ops/client/deliveryservices_required_capabilities.go
+++ b/traffic_ops/client/deliveryservices_required_capabilities.go
@@ -19,6 +19,7 @@ import (
"encoding/json"
"fmt"
"net"
+ "net/http"
"net/url"
"strconv"
@@ -55,7 +56,7 @@ func (to *Session) DeleteDeliveryServicesRequiredCapability(deliveryserviceID in
// GetDeliveryServicesRequiredCapabilities retrieves a list of Required Capabilities that are assigned to a Delivery Service
// Callers can filter the results by delivery service id, xml id and/or required capability via the optional parameters
-func (to *Session) GetDeliveryServicesRequiredCapabilities(deliveryServiceID *int, xmlID, capability *string) ([]tc.DeliveryServicesRequiredCapability, ReqInf, error) {
+func (to *Session) GetDeliveryServicesRequiredCapabilities(deliveryServiceID *int, xmlID, capability *string, header http.Header) ([]tc.DeliveryServicesRequiredCapability, ReqInf, error) {
param := url.Values{}
if deliveryServiceID != nil {
param.Add("deliveryServiceID", strconv.Itoa(*deliveryServiceID))
@@ -75,7 +76,7 @@ func (to *Session) GetDeliveryServicesRequiredCapabilities(deliveryServiceID *in
resp := struct {
Response []tc.DeliveryServicesRequiredCapability `json:"response"`
}{}
- reqInf, err := get(to, url, &resp)
+ reqInf, err := get(to, url, &resp, header)
if err != nil {
return nil, reqInf, err
}
diff --git a/traffic_ops/client/deliveryserviceserver.go b/traffic_ops/client/deliveryserviceserver.go
index d1d92e3..336145e 100644
--- a/traffic_ops/client/deliveryserviceserver.go
+++ b/traffic_ops/client/deliveryserviceserver.go
@@ -53,7 +53,7 @@ func (to *Session) CreateDeliveryServiceServers(dsID int, serverIDs []int, repla
func (to *Session) DeleteDeliveryServiceServer(dsID int, serverID int) (tc.Alerts, ReqInf, error) {
route := apiBase + `/deliveryserviceserver/` + strconv.Itoa(dsID) + "/" + strconv.Itoa(serverID)
- reqResp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ reqResp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, errors.New("requesting from Traffic Ops: " + err.Error())
@@ -71,7 +71,7 @@ func (to *Session) AssignServersToDeliveryService(servers []string, xmlId string
route := fmt.Sprintf(API_DELIVERY_SERVICES_SERVERS, xmlId)
dss := tc.DeliveryServiceServers{ServerNames: servers, XmlId: xmlId}
reqBody, err := json.Marshal(&dss)
- reqResp, remoteAddr, err := to.request(http.MethodPost, route, reqBody)
+ reqResp, remoteAddr, err := to.request(http.MethodPost, route, reqBody, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if reqResp != nil {
reqInf.StatusCode = reqResp.StatusCode
@@ -129,7 +129,7 @@ func (to *Session) getDeliveryServiceServers(urlQuery url.Values) (tc.DeliverySe
if qry := urlQuery.Encode(); qry != "" {
route += `?` + qry
}
- reqResp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ reqResp, remoteAddr, err := to.request(http.MethodGet, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.DeliveryServiceServerResponse{}, reqInf, errors.New("requesting from Traffic Ops: " + err.Error())
diff --git a/traffic_ops/client/division.go b/traffic_ops/client/division.go
index 4fea812..7bf36d1 100644
--- a/traffic_ops/client/division.go
+++ b/traffic_ops/client/division.go
@@ -37,7 +37,7 @@ func (to *Session) CreateDivision(division tc.Division) (tc.Alerts, ReqInf, erro
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_DIVISIONS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_DIVISIONS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -57,7 +57,7 @@ func (to *Session) UpdateDivisionByID(id int, division tc.Division) (tc.Alerts,
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_DIVISIONS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -68,9 +68,15 @@ func (to *Session) UpdateDivisionByID(id int, division tc.Division) (tc.Alerts,
}
// Returns a list of Divisions
-func (to *Session) GetDivisions() ([]tc.Division, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_DIVISIONS, nil)
+func (to *Session) GetDivisions(header http.Header) ([]tc.Division, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_DIVISIONS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Division{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -82,10 +88,16 @@ func (to *Session) GetDivisions() ([]tc.Division, ReqInf, error) {
}
// GET a Division by the Division id
-func (to *Session) GetDivisionByID(id int) ([]tc.Division, ReqInf, error) {
+func (to *Session) GetDivisionByID(id int, header http.Header) ([]tc.Division, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_DIVISIONS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Division{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -100,10 +112,16 @@ func (to *Session) GetDivisionByID(id int) ([]tc.Division, ReqInf, error) {
}
// GET a Division by the Division name
-func (to *Session) GetDivisionByName(name string) ([]tc.Division, ReqInf, error) {
+func (to *Session) GetDivisionByName(name string, header http.Header) ([]tc.Division, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_DIVISIONS, name)
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Division{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -120,7 +138,7 @@ func (to *Session) GetDivisionByName(name string) ([]tc.Division, ReqInf, error)
// DELETE a Division by Division id
func (to *Session) DeleteDivisionByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_DIVISIONS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/federation.go b/traffic_ops/client/federation.go
index 9b509ca..4ceb4cc 100644
--- a/traffic_ops/client/federation.go
+++ b/traffic_ops/client/federation.go
@@ -25,31 +25,31 @@ import (
"github.com/apache/trafficcontrol/lib/go-tc"
)
-func (to *Session) Federations() ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+func (to *Session) Federations(header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
type FederationResponse struct {
Response []tc.AllDeliveryServiceFederationsMapping `json:"response"`
}
data := FederationResponse{}
- inf, err := get(to, apiBase+"/federations", &data)
+ inf, err := get(to, apiBase+"/federations", &data, header)
return data.Response, inf, err
}
-func (to *Session) AllFederations() ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+func (to *Session) AllFederations(header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
type FederationResponse struct {
Response []tc.AllDeliveryServiceFederationsMapping `json:"response"`
}
data := FederationResponse{}
- inf, err := get(to, apiBase+"/federations/all", &data)
+ inf, err := get(to, apiBase+"/federations/all", &data, header)
return data.Response, inf, err
}
-func (to *Session) AllFederationsForCDN(cdnName string) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
+func (to *Session) AllFederationsForCDN(cdnName string, header http.Header) ([]tc.AllDeliveryServiceFederationsMapping, ReqInf, error) {
// because the Federations JSON array is heterogeneous (array members may be a AllFederation or AllFederationCDN), we have to try decoding each separately.
type FederationResponse struct {
Response []json.RawMessage `json:"response"`
}
data := FederationResponse{}
- inf, err := get(to, apiBase+"/federations/all?cdnName="+cdnName, &data)
+ inf, err := get(to, apiBase+"/federations/all?cdnName="+cdnName, &data, header)
if err != nil {
return nil, inf, err
}
@@ -76,24 +76,24 @@ func (to *Session) CreateFederationDeliveryServices(federationID int, deliverySe
return ReqInf{CacheHitStatus: CacheHitStatusMiss}, err
}
resp := map[string]interface{}{}
- inf, err := makeReq(to, http.MethodPost, apiBase+`/federations/`+strconv.Itoa(federationID)+`/deliveryservices`, jsonReq, &resp)
+ inf, err := makeReq(to, http.MethodPost, apiBase+`/federations/`+strconv.Itoa(federationID)+`/deliveryservices`, jsonReq, &resp, nil)
return inf, err
}
// GetFederationDeliveryServices Returns a given Federation's Delivery Services
-func (to *Session) GetFederationDeliveryServices(federationID int) ([]tc.FederationDeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetFederationDeliveryServices(federationID int, header http.Header) ([]tc.FederationDeliveryServiceNullable, ReqInf, error) {
type FederationDSesResponse struct {
Response []tc.FederationDeliveryServiceNullable `json:"response"`
}
data := FederationDSesResponse{}
- inf, err := get(to, fmt.Sprintf("%s/federations/%v/deliveryservices", apiBase, federationID), &data)
+ inf, err := get(to, fmt.Sprintf("%s/federations/%v/deliveryservices", apiBase, federationID), &data, header)
return data.Response, inf, err
}
// DeleteFederationDeliveryService Deletes a given Delivery Service from a Federation
func (to *Session) DeleteFederationDeliveryService(federationID, deliveryServiceID int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/federations/%v/deliveryservices/%v", apiBase, federationID, deliveryServiceID)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -114,24 +114,24 @@ func (to *Session) CreateFederationUsers(federationID int, userIDs []int, replac
return tc.Alerts{}, ReqInf{CacheHitStatus: CacheHitStatusMiss}, err
}
var alerts tc.Alerts
- inf, err := makeReq(to, http.MethodPost, fmt.Sprintf("%s/federations/%v/users", apiBase, federationID), jsonReq, &alerts)
+ inf, err := makeReq(to, http.MethodPost, fmt.Sprintf("%s/federations/%v/users", apiBase, federationID), jsonReq, &alerts, nil)
return alerts, inf, err
}
// GetFederationUsers Returns a given Federation's Users
-func (to *Session) GetFederationUsers(federationID int) ([]tc.FederationUser, ReqInf, error) {
+func (to *Session) GetFederationUsers(federationID int, header http.Header) ([]tc.FederationUser, ReqInf, error) {
type FederationUsersResponse struct {
Response []tc.FederationUser `json:"response"`
}
data := FederationUsersResponse{}
- inf, err := get(to, fmt.Sprintf("%s/federations/%v/users", apiBase, federationID), &data)
+ inf, err := get(to, fmt.Sprintf("%s/federations/%v/users", apiBase, federationID), &data, header)
return data.Response, inf, err
}
// DeleteFederationUser Deletes a given User from a Federation
func (to *Session) DeleteFederationUser(federationID, userID int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/federations/%v/users/%v", apiBase, federationID, userID)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -155,7 +155,7 @@ func (to *Session) AddFederationResolverMappingsForCurrentUser(mappings tc.Deliv
return alerts, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, apiBase+"/federations", bts)
+ resp, remoteAddr, err := to.request(http.MethodPost, apiBase+"/federations", bts, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return alerts, reqInf, err
@@ -173,7 +173,7 @@ func (to *Session) DeleteFederationResolverMappingsForCurrentUser() (tc.Alerts,
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss}
var alerts tc.Alerts
- resp, remoteAddr, err := to.request(http.MethodDelete, apiBase+"/federations", nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, apiBase+"/federations", nil, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return alerts, reqInf, err
@@ -199,7 +199,7 @@ func (to *Session) ReplaceFederationResolverMappingsForCurrentUser(mappings tc.D
return alerts, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPut, apiBase+"/federations", bts)
+ resp, remoteAddr, err := to.request(http.MethodPut, apiBase+"/federations", bts, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return alerts, reqInf, err
diff --git a/traffic_ops/client/federation_federation_resolver.go b/traffic_ops/client/federation_federation_resolver.go
index 4aaff34..cfcedb1 100644
--- a/traffic_ops/client/federation_federation_resolver.go
+++ b/traffic_ops/client/federation_federation_resolver.go
@@ -28,7 +28,7 @@ func (to *Session) GetFederationFederationResolversByID(id int) (tc.FederationFe
reqInf = ReqInf{CacheHitStatus: CacheHitStatusMiss}
resp tc.FederationFederationResolversResponse
)
- httpResp, remoteAddr, err := to.request(http.MethodGet, path, nil)
+ httpResp, remoteAddr, err := to.request(http.MethodGet, path, nil, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return resp, reqInf, err
@@ -57,7 +57,7 @@ func (to *Session) AssignFederationFederationResolver(fedID int, resolverIDs []i
return resp, reqInf, err
}
- httpResp, remoteAddr, err := to.request(http.MethodPost, path, reqBody)
+ httpResp, remoteAddr, err := to.request(http.MethodPost, path, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return resp, reqInf, err
diff --git a/traffic_ops/client/federation_resolver.go b/traffic_ops/client/federation_resolver.go
index e0a2dd8..5eca513 100644
--- a/traffic_ops/client/federation_resolver.go
+++ b/traffic_ops/client/federation_resolver.go
@@ -21,7 +21,7 @@ import "strconv"
import "github.com/apache/trafficcontrol/lib/go-tc"
-func (to *Session) getFederationResolvers(id *uint, ip *string, t *string) ([]tc.FederationResolver, ReqInf, error) {
+func (to *Session) getFederationResolvers(id *uint, ip *string, t *string, header http.Header) ([]tc.FederationResolver, ReqInf, error) {
var vals = url.Values{}
if id != nil {
vals.Set("id", strconv.FormatUint(uint64(*id), 10))
@@ -41,19 +41,19 @@ func (to *Session) getFederationResolvers(id *uint, ip *string, t *string) ([]tc
var data struct {
Response []tc.FederationResolver `json:"response"`
}
- inf, err := get(to, path, &data)
+ inf, err := get(to, path, &data, header)
return data.Response, inf, err
}
// GetFederationResolvers retrieves all Federation Resolvers from Traffic Ops
-func (to *Session) GetFederationResolvers() ([]tc.FederationResolver, ReqInf, error) {
- return to.getFederationResolvers(nil, nil, nil)
+func (to *Session) GetFederationResolvers(header http.Header) ([]tc.FederationResolver, ReqInf, error) {
+ return to.getFederationResolvers(nil, nil, nil, header)
}
// GetFederationResolverByID retrieves a single Federation Resolver identified by ID.
-func (to *Session) GetFederationResolverByID(ID uint) (tc.FederationResolver, ReqInf, error) {
+func (to *Session) GetFederationResolverByID(ID uint, header http.Header) (tc.FederationResolver, ReqInf, error) {
var fr tc.FederationResolver
- frs, inf, err := to.getFederationResolvers(&ID, nil, nil)
+ frs, inf, err := to.getFederationResolvers(&ID, nil, nil, header)
if len(frs) > 0 {
fr = frs[0]
}
@@ -62,9 +62,9 @@ func (to *Session) GetFederationResolverByID(ID uint) (tc.FederationResolver, Re
// GetFederationResolverByIPAddress retrieves the Federation Resolver that uses the IP address or
// CIDR-notation subnet 'ip'.
-func (to *Session) GetFederationResolverByIPAddress(ip string) (tc.FederationResolver, ReqInf, error) {
+func (to *Session) GetFederationResolverByIPAddress(ip string, header http.Header) (tc.FederationResolver, ReqInf, error) {
var fr tc.FederationResolver
- frs, inf, err := to.getFederationResolvers(nil, &ip, nil)
+ frs, inf, err := to.getFederationResolvers(nil, &ip, nil, header)
if len(frs) > 0 {
fr = frs[0]
}
@@ -72,8 +72,8 @@ func (to *Session) GetFederationResolverByIPAddress(ip string) (tc.FederationRes
}
// GetFederationResolversByType gets all Federation Resolvers that are of the Type named 't'.
-func (to *Session) GetFederationResolversByType(t string) ([]tc.FederationResolver, ReqInf, error) {
- return to.getFederationResolvers(nil, nil, &t)
+func (to *Session) GetFederationResolversByType(t string, header http.Header) ([]tc.FederationResolver, ReqInf, error) {
+ return to.getFederationResolvers(nil, nil, &t, header)
}
// CreateFederationResolver creates the Federation Resolver 'fr'.
@@ -87,7 +87,7 @@ func (to *Session) CreateFederationResolver(fr tc.FederationResolver) (tc.Alerts
}
var resp *http.Response
- resp, reqInf.RemoteAddr, err = to.request(http.MethodPost, apiBase+"/federation_resolvers", req)
+ resp, reqInf.RemoteAddr, err = to.request(http.MethodPost, apiBase+"/federation_resolvers", req, nil)
if err != nil {
return alerts, reqInf, err
}
@@ -105,7 +105,7 @@ func (to *Session) DeleteFederationResolver(id uint) (tc.Alerts, ReqInf, error)
var path = fmt.Sprintf("%s/federation_resolvers?id=%d", apiBase, id)
var resp *http.Response
var err error
- resp, reqInf.RemoteAddr, err = to.request(http.MethodDelete, path, nil)
+ resp, reqInf.RemoteAddr, err = to.request(http.MethodDelete, path, nil, nil)
if err != nil {
return alerts, reqInf, err
}
diff --git a/traffic_ops/client/iso.go b/traffic_ops/client/iso.go
index 233a895..edf4bb0 100644
--- a/traffic_ops/client/iso.go
+++ b/traffic_ops/client/iso.go
@@ -36,7 +36,7 @@ const (
// key: Name of OS
// value: Directory where the ISO source can be found
func (to *Session) GetOSVersions() (map[string]string, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_OSVERSIONS, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, API_OSVERSIONS, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
diff --git a/traffic_ops/client/job.go b/traffic_ops/client/job.go
index 8325ae4..3d1c900 100644
--- a/traffic_ops/client/job.go
+++ b/traffic_ops/client/job.go
@@ -34,7 +34,7 @@ func (to *Session) CreateInvalidationJob(job tc.InvalidationJobInput) (tc.Alerts
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, apiBase+`/jobs`, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, apiBase+`/jobs`, reqBody, nil)
if resp != nil {
reqInf.StatusCode = resp.StatusCode
}
@@ -67,7 +67,7 @@ func (to *Session) GetJobs(deliveryServiceID *int, userID *int) ([]tc.Job, ReqIn
}
}
- resp, remoteAddr, err := to.request(http.MethodGet, path, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, path, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -162,7 +162,7 @@ func (to *Session) GetInvalidationJobs(ds *interface{}, user *interface{}) ([]tc
}
}
- resp, remoteAddr, err := to.request(http.MethodGet, path, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, path, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
diff --git a/traffic_ops/client/log.go b/traffic_ops/client/log.go
index cff6b46..50e35f8 100644
--- a/traffic_ops/client/log.go
+++ b/traffic_ops/client/log.go
@@ -30,7 +30,7 @@ const (
// GetLogsByQueryParams gets a list of logs filtered by query params.
func (to *Session) GetLogsByQueryParams(queryParams string) ([]tc.Log, ReqInf, error) {
URI := API_LOGS + queryParams
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
diff --git a/traffic_ops/client/origin.go b/traffic_ops/client/origin.go
index 488b57d..b9732c8 100644
--- a/traffic_ops/client/origin.go
+++ b/traffic_ops/client/origin.go
@@ -32,7 +32,7 @@ const (
func originIDs(to *Session, origin *tc.Origin) error {
if origin.CachegroupID == nil && origin.Cachegroup != nil {
- p, _, err := to.GetCacheGroupNullableByName(*origin.Cachegroup)
+ p, _, err := to.GetCacheGroupNullableByName(*origin.Cachegroup, nil)
if err != nil {
return err
}
@@ -43,7 +43,7 @@ func originIDs(to *Session, origin *tc.Origin) error {
}
if origin.DeliveryServiceID == nil && origin.DeliveryService != nil {
- dses, _, err := to.GetDeliveryServiceByXMLIDNullable(*origin.DeliveryService)
+ dses, _, err := to.GetDeliveryServiceByXMLIDNullable(*origin.DeliveryService, nil)
if err != nil {
return err
}
@@ -54,7 +54,7 @@ func originIDs(to *Session, origin *tc.Origin) error {
}
if origin.ProfileID == nil && origin.Profile != nil {
- profiles, _, err := to.GetProfileByName(*origin.Profile)
+ profiles, _, err := to.GetProfileByName(*origin.Profile, nil)
if err != nil {
return err
}
@@ -65,7 +65,7 @@ func originIDs(to *Session, origin *tc.Origin) error {
}
if origin.CoordinateID == nil && origin.Coordinate != nil {
- coordinates, _, err := to.GetCoordinateByName(*origin.Coordinate)
+ coordinates, _, err := to.GetCoordinateByName(*origin.Coordinate, nil)
if err != nil {
return err
}
@@ -76,7 +76,7 @@ func originIDs(to *Session, origin *tc.Origin) error {
}
if origin.TenantID == nil && origin.Tenant != nil {
- tenant, _, err := to.TenantByName(*origin.Tenant)
+ tenant, _, err := to.TenantByName(*origin.Tenant, nil)
if err != nil {
return err
}
@@ -100,7 +100,7 @@ func (to *Session) CreateOrigin(origin tc.Origin) (*tc.OriginDetailResponse, Req
if err != nil {
return nil, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_ORIGINS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_ORIGINS, reqBody, nil)
if err != nil {
return nil, reqInf, err
}
@@ -127,7 +127,7 @@ func (to *Session) UpdateOriginByID(id int, origin tc.Origin) (*tc.OriginDetailR
return nil, reqInf, err
}
route := fmt.Sprintf("%s?id=%d", API_ORIGINS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return nil, reqInf, err
}
@@ -142,7 +142,7 @@ func (to *Session) UpdateOriginByID(id int, origin tc.Origin) (*tc.OriginDetailR
// GET a list of Origins by a query parameter string
func (to *Session) GetOriginsByQueryParams(queryParams string) ([]tc.Origin, ReqInf, error) {
URI := API_ORIGINS + queryParams
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -180,7 +180,7 @@ func (to *Session) GetOriginsByDeliveryServiceID(id int) ([]tc.Origin, ReqInf, e
// DELETE an Origin by ID
func (to *Session) DeleteOriginByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_ORIGINS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/parameter.go b/traffic_ops/client/parameter.go
index c4cc19a..2824eeb 100644
--- a/traffic_ops/client/parameter.go
+++ b/traffic_ops/client/parameter.go
@@ -38,7 +38,7 @@ func (to *Session) CreateParameter(pl tc.Parameter) (tc.Alerts, ReqInf, error) {
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_PARAMETERS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_PARAMETERS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -57,7 +57,7 @@ func (to *Session) CreateMultipleParameters(pls []tc.Parameter) (tc.Alerts, ReqI
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_PARAMETERS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_PARAMETERS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -77,7 +77,7 @@ func (to *Session) UpdateParameterByID(id int, pl tc.Parameter) (tc.Alerts, ReqI
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_PARAMETERS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -88,9 +88,15 @@ func (to *Session) UpdateParameterByID(id int, pl tc.Parameter) (tc.Alerts, ReqI
}
// GetParameters returns a list of Parameters.
-func (to *Session) GetParameters() ([]tc.Parameter, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_PARAMETERS, nil)
+func (to *Session) GetParameters(header http.Header) ([]tc.Parameter, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_PARAMETERS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Parameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -102,10 +108,16 @@ func (to *Session) GetParameters() ([]tc.Parameter, ReqInf, error) {
}
// GetParameterByID GETs a Parameter by the Parameter ID.
-func (to *Session) GetParameterByID(id int) ([]tc.Parameter, ReqInf, error) {
+func (to *Session) GetParameterByID(id int, header http.Header) ([]tc.Parameter, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_PARAMETERS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Parameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -120,10 +132,16 @@ func (to *Session) GetParameterByID(id int) ([]tc.Parameter, ReqInf, error) {
}
// GetParameterByName GETs a Parameter by the Parameter name.
-func (to *Session) GetParameterByName(name string) ([]tc.Parameter, ReqInf, error) {
+func (to *Session) GetParameterByName(name string, header http.Header) ([]tc.Parameter, ReqInf, error) {
URI := API_PARAMETERS + "?name=" + url.QueryEscape(name)
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Parameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -138,10 +156,16 @@ func (to *Session) GetParameterByName(name string) ([]tc.Parameter, ReqInf, erro
}
// GetParameterByConfigFile GETs a Parameter by the Parameter ConfigFile.
-func (to *Session) GetParameterByConfigFile(configFile string) ([]tc.Parameter, ReqInf, error) {
+func (to *Session) GetParameterByConfigFile(configFile string, header http.Header) ([]tc.Parameter, ReqInf, error) {
URI := API_PARAMETERS + "?configFile=" + url.QueryEscape(configFile)
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Parameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -156,10 +180,16 @@ func (to *Session) GetParameterByConfigFile(configFile string) ([]tc.Parameter,
}
// GetParameterByNameAndConfigFile GETs a Parameter by the Parameter Name and ConfigFile.
-func (to *Session) GetParameterByNameAndConfigFile(name string, configFile string) ([]tc.Parameter, ReqInf, error) {
+func (to *Session) GetParameterByNameAndConfigFile(name string, configFile string, header http.Header) ([]tc.Parameter, ReqInf, error) {
URI := fmt.Sprintf("%s?name=%s&configFile=%s", API_PARAMETERS, url.QueryEscape(name), url.QueryEscape(configFile))
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Parameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -176,8 +206,11 @@ func (to *Session) GetParameterByNameAndConfigFile(name string, configFile strin
// GetParameterByNameAndConfigFileAndValue GETs a Parameter by the Parameter Name and ConfigFile and Value.
// TODO: API should support all 3, but does not support filter by value
// currently. Until then, loop through hits until you find one with that value.
-func (to *Session) GetParameterByNameAndConfigFileAndValue(name, configFile, value string) ([]tc.Parameter, ReqInf, error) {
- params, reqInf, err := to.GetParameterByNameAndConfigFile(name, configFile)
+func (to *Session) GetParameterByNameAndConfigFileAndValue(name, configFile, value string, header http.Header) ([]tc.Parameter, ReqInf, error) {
+ params, reqInf, err := to.GetParameterByNameAndConfigFile(name, configFile, header)
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Parameter{}, reqInf, nil
+ }
if err != nil {
return params, reqInf, err
}
@@ -192,7 +225,7 @@ func (to *Session) GetParameterByNameAndConfigFileAndValue(name, configFile, val
// DeleteParameterByID DELETEs a Parameter by ID.
func (to *Session) DeleteParameterByID(id int) (tc.Alerts, ReqInf, error) {
URI := fmt.Sprintf("%s/%d", API_PARAMETERS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/phys_location.go b/traffic_ops/client/phys_location.go
index b82f1c9..da3346f 100644
--- a/traffic_ops/client/phys_location.go
+++ b/traffic_ops/client/phys_location.go
@@ -33,7 +33,7 @@ const (
// CreatePhysLocation creates a PhysLocation.
func (to *Session) CreatePhysLocation(pl tc.PhysLocation) (tc.Alerts, ReqInf, error) {
if pl.RegionID == 0 && pl.RegionName != "" {
- regions, _, err := to.GetRegionByName(pl.RegionName)
+ regions, _, err := to.GetRegionByName(pl.RegionName, nil)
if err != nil {
return tc.Alerts{}, ReqInf{}, err
}
@@ -48,7 +48,7 @@ func (to *Session) CreatePhysLocation(pl tc.PhysLocation) (tc.Alerts, ReqInf, er
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_PHYS_LOCATIONS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_PHYS_LOCATIONS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -68,7 +68,7 @@ func (to *Session) UpdatePhysLocationByID(id int, pl tc.PhysLocation) (tc.Alerts
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_PHYS_LOCATIONS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -79,10 +79,16 @@ func (to *Session) UpdatePhysLocationByID(id int, pl tc.PhysLocation) (tc.Alerts
}
// Returns a list of PhysLocations with optional query parameters applied
-func (to *Session) GetPhysLocations(params map[string]string) ([]tc.PhysLocation, ReqInf, error) {
+func (to *Session) GetPhysLocations(params map[string]string, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
path := API_PHYS_LOCATIONS + mapToQueryParameters(params)
- resp, remoteAddr, err := to.request(http.MethodGet, path, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, path, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.PhysLocation{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -94,10 +100,16 @@ func (to *Session) GetPhysLocations(params map[string]string) ([]tc.PhysLocation
}
// GET a PhysLocation by the PhysLocation ID
-func (to *Session) GetPhysLocationByID(id int) ([]tc.PhysLocation, ReqInf, error) {
+func (to *Session) GetPhysLocationByID(id int, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_PHYS_LOCATIONS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.PhysLocation{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -112,10 +124,16 @@ func (to *Session) GetPhysLocationByID(id int) ([]tc.PhysLocation, ReqInf, error
}
// GET a PhysLocation by the PhysLocation name
-func (to *Session) GetPhysLocationByName(name string) ([]tc.PhysLocation, ReqInf, error) {
+func (to *Session) GetPhysLocationByName(name string, header http.Header) ([]tc.PhysLocation, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_PHYS_LOCATIONS, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.PhysLocation{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -132,7 +150,7 @@ func (to *Session) GetPhysLocationByName(name string) ([]tc.PhysLocation, ReqInf
// DELETE a PhysLocation by ID
func (to *Session) DeletePhysLocationByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_PHYS_LOCATIONS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/ping.go b/traffic_ops/client/ping.go
index db38b52..ff898d5 100644
--- a/traffic_ops/client/ping.go
+++ b/traffic_ops/client/ping.go
@@ -26,7 +26,7 @@ const (
// Ping returns a static json object to show that traffic_ops is responsive
func (to *Session) Ping() (map[string]string, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_PING, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, API_PING, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
diff --git a/traffic_ops/client/profile.go b/traffic_ops/client/profile.go
index 66af27a..f9afeb1 100644
--- a/traffic_ops/client/profile.go
+++ b/traffic_ops/client/profile.go
@@ -35,7 +35,7 @@ func (to *Session) CreateProfile(pl tc.Profile) (tc.Alerts, ReqInf, error) {
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss}
if pl.CDNID == 0 && pl.CDNName != "" {
- cdns, _, err := to.GetCDNByName(pl.CDNName)
+ cdns, _, err := to.GetCDNByName(pl.CDNName, nil)
if err != nil {
return tc.Alerts{}, ReqInf{}, err
}
@@ -59,7 +59,7 @@ func (to *Session) CreateProfile(pl tc.Profile) (tc.Alerts, ReqInf, error) {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_PROFILES, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_PROFILES, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -82,7 +82,7 @@ func (to *Session) UpdateProfileByID(id int, pl tc.Profile) (tc.Alerts, ReqInf,
}
route := fmt.Sprintf("%s/%d", API_PROFILES, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -96,10 +96,16 @@ func (to *Session) UpdateProfileByID(id int, pl tc.Profile) (tc.Alerts, ReqInf,
}
// GetParametersByProfileName gets all of the Parameters assigned to the Profile named 'profileName'.
-func (to *Session) GetParametersByProfileName(profileName string) ([]tc.Parameter, ReqInf, error) {
+func (to *Session) GetParametersByProfileName(profileName string, header http.Header) ([]tc.Parameter, ReqInf, error) {
url := fmt.Sprintf(API_PROFILES_NAME_PARAMETERS, profileName)
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Parameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -114,11 +120,17 @@ func (to *Session) GetParametersByProfileName(profileName string) ([]tc.Paramete
}
// GetProfiles returns a list of Profiles.
-func (to *Session) GetProfiles() ([]tc.Profile, ReqInf, error) {
+func (to *Session) GetProfiles(header http.Header) ([]tc.Profile, ReqInf, error) {
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss}
- resp, remoteAddr, err := to.request(http.MethodGet, API_PROFILES, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, API_PROFILES, nil, header)
reqInf.RemoteAddr = remoteAddr
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Profile{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -131,10 +143,16 @@ func (to *Session) GetProfiles() ([]tc.Profile, ReqInf, error) {
}
// GetProfileByID GETs a Profile by the Profile ID.
-func (to *Session) GetProfileByID(id int) ([]tc.Profile, ReqInf, error) {
+func (to *Session) GetProfileByID(id int, header http.Header) ([]tc.Profile, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_PROFILES, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Profile{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -147,10 +165,16 @@ func (to *Session) GetProfileByID(id int) ([]tc.Profile, ReqInf, error) {
}
// GetProfileByName GETs a Profile by the Profile name.
-func (to *Session) GetProfileByName(name string) ([]tc.Profile, ReqInf, error) {
+func (to *Session) GetProfileByName(name string, header http.Header) ([]tc.Profile, ReqInf, error) {
URI := fmt.Sprintf("%s?name=%s", API_PROFILES, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Profile{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -163,10 +187,16 @@ func (to *Session) GetProfileByName(name string) ([]tc.Profile, ReqInf, error) {
}
// GetProfileByParameter GETs a Profile by the Profile "param".
-func (to *Session) GetProfileByParameter(param string) ([]tc.Profile, ReqInf, error) {
+func (to *Session) GetProfileByParameter(param string, header http.Header) ([]tc.Profile, ReqInf, error) {
URI := fmt.Sprintf("%s?param=%s", API_PROFILES, url.QueryEscape(param))
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Profile{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -179,10 +209,16 @@ func (to *Session) GetProfileByParameter(param string) ([]tc.Profile, ReqInf, er
}
// GetProfileByCDNID GETs a Profile by the Profile CDN ID.
-func (to *Session) GetProfileByCDNID(cdnID int) ([]tc.Profile, ReqInf, error) {
+func (to *Session) GetProfileByCDNID(cdnID int, header http.Header) ([]tc.Profile, ReqInf, error) {
URI := fmt.Sprintf("%s?cdn=%s", API_PROFILES, strconv.Itoa(cdnID))
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Profile{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -197,7 +233,7 @@ func (to *Session) GetProfileByCDNID(cdnID int) ([]tc.Profile, ReqInf, error) {
// DeleteProfileByID DELETEs a Profile by ID.
func (to *Session) DeleteProfileByID(id int) (tc.Alerts, ReqInf, error) {
URI := fmt.Sprintf("%s/%d", API_PROFILES, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -213,7 +249,7 @@ func (to *Session) DeleteProfileByID(id int) (tc.Alerts, ReqInf, error) {
// ExportProfile Returns an exported Profile.
func (to *Session) ExportProfile(id int) (*tc.ProfileExportResponse, ReqInf, error) {
route := fmt.Sprintf("%s/%d/export", API_PROFILES, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -236,7 +272,7 @@ func (to *Session) ImportProfile(importRequest *tc.ProfileImportRequest) (*tc.Pr
return nil, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, route, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return nil, reqInf, err
@@ -262,7 +298,7 @@ func (to *Session) CopyProfile(p tc.ProfileCopy) (tc.ProfileCopyResponse, ReqInf
return tc.ProfileCopyResponse{}, ReqInf{}, err
}
- httpResp, remoteAddr, err := to.request(http.MethodPost, path, reqBody)
+ httpResp, remoteAddr, err := to.request(http.MethodPost, path, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return tc.ProfileCopyResponse{}, reqInf, err
diff --git a/traffic_ops/client/profile_parameter.go b/traffic_ops/client/profile_parameter.go
index fde2336..6a4b74d 100644
--- a/traffic_ops/client/profile_parameter.go
+++ b/traffic_ops/client/profile_parameter.go
@@ -39,7 +39,7 @@ func (to *Session) CreateProfileParameter(pp tc.ProfileParameter) (tc.Alerts, Re
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_PROFILE_PARAMETERS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_PROFILE_PARAMETERS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -58,7 +58,7 @@ func (to *Session) CreateMultipleProfileParameters(pps []tc.ProfileParameter) (t
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_PROFILE_PARAMETERS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_PROFILE_PARAMETERS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -69,9 +69,15 @@ func (to *Session) CreateMultipleProfileParameters(pps []tc.ProfileParameter) (t
}
// Returns a list of Profile Parameters
-func (to *Session) GetProfileParameters() ([]tc.ProfileParameter, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_PROFILE_PARAMETERS, nil)
+func (to *Session) GetProfileParameters(header http.Header) ([]tc.ProfileParameter, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_PROFILE_PARAMETERS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.ProfileParameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -83,10 +89,16 @@ func (to *Session) GetProfileParameters() ([]tc.ProfileParameter, ReqInf, error)
}
// GET a Profile Parameter by the Parameter
-func (to *Session) GetProfileParameterByQueryParams(queryParams string) ([]tc.ProfileParameter, ReqInf, error) {
+func (to *Session) GetProfileParameterByQueryParams(queryParams string, header http.Header) ([]tc.ProfileParameter, ReqInf, error) {
URI := API_PROFILE_PARAMETERS + queryParams
- resp, remoteAddr, err := to.request(http.MethodGet, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, URI, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.ProfileParameter{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -103,7 +115,7 @@ func (to *Session) GetProfileParameterByQueryParams(queryParams string) ([]tc.Pr
// DELETE a Parameter by Parameter
func (to *Session) DeleteParameterByProfileParameter(profile int, parameter int) (tc.Alerts, ReqInf, error) {
URI := fmt.Sprintf("%s/%d/%d", API_PROFILE_PARAMETERS, profile, parameter)
- resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/region.go b/traffic_ops/client/region.go
index 616c5b0..53c3bed 100644
--- a/traffic_ops/client/region.go
+++ b/traffic_ops/client/region.go
@@ -34,7 +34,7 @@ const (
// CreateRegion creates a Region.
func (to *Session) CreateRegion(region tc.Region) (tc.Alerts, ReqInf, error) {
if region.Division == 0 && region.DivisionName != "" {
- divisions, _, err := to.GetDivisionByName(region.DivisionName)
+ divisions, _, err := to.GetDivisionByName(region.DivisionName, nil)
if err != nil {
return tc.Alerts{}, ReqInf{}, err
}
@@ -50,7 +50,7 @@ func (to *Session) CreateRegion(region tc.Region) (tc.Alerts, ReqInf, error) {
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_REGIONS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_REGIONS, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -70,7 +70,7 @@ func (to *Session) UpdateRegionByID(id int, region tc.Region) (tc.Alerts, ReqInf
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_REGIONS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -81,9 +81,15 @@ func (to *Session) UpdateRegionByID(id int, region tc.Region) (tc.Alerts, ReqInf
}
// GetRegions returns a list of regions.
-func (to *Session) GetRegions() ([]tc.Region, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_REGIONS, nil)
+func (to *Session) GetRegions(header http.Header) ([]tc.Region, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_REGIONS, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Region{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -95,10 +101,16 @@ func (to *Session) GetRegions() ([]tc.Region, ReqInf, error) {
}
// GetRegionByID GETs a Region by the Region ID.
-func (to *Session) GetRegionByID(id int) ([]tc.Region, ReqInf, error) {
+func (to *Session) GetRegionByID(id int, header http.Header) ([]tc.Region, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_REGIONS, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Region{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -113,10 +125,16 @@ func (to *Session) GetRegionByID(id int) ([]tc.Region, ReqInf, error) {
}
// GetRegionByName GETs a Region by the Region name.
-func (to *Session) GetRegionByName(name string) ([]tc.Region, ReqInf, error) {
+func (to *Session) GetRegionByName(name string, header http.Header) ([]tc.Region, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_REGIONS, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Region{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -133,7 +151,7 @@ func (to *Session) GetRegionByName(name string) ([]tc.Region, ReqInf, error) {
// DeleteRegionByID DELETEs a Region by ID.
func (to *Session) DeleteRegionByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_REGIONS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -158,7 +176,7 @@ func (to *Session) DeleteRegion(id *int, name *string) (tc.Alerts, ReqInf, error
URI = fmt.Sprintf("%s?%s", URI, qStr)
}
- resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/role.go b/traffic_ops/client/role.go
index 7b2fb48..3ce2035 100644
--- a/traffic_ops/client/role.go
+++ b/traffic_ops/client/role.go
@@ -38,7 +38,7 @@ func (to *Session) CreateRole(region tc.Role) (tc.Alerts, ReqInf, int, error) {
if err != nil {
return tc.Alerts{}, reqInf, 0, err
}
- resp, remoteAddr, errClient := to.RawRequest(http.MethodPost, API_ROLES, reqBody)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodPost, API_ROLES, reqBody, nil)
if resp != nil {
defer resp.Body.Close()
var alerts tc.Alerts
@@ -60,7 +60,7 @@ func (to *Session) UpdateRoleByID(id int, region tc.Role) (tc.Alerts, ReqInf, in
return tc.Alerts{}, reqInf, 0, err
}
route := fmt.Sprintf("%s/?id=%d", API_ROLES, id)
- resp, remoteAddr, errClient := to.RawRequest(http.MethodPut, route, reqBody)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodPut, route, reqBody, nil)
if resp != nil {
defer resp.Body.Close()
var alerts tc.Alerts
@@ -73,10 +73,16 @@ func (to *Session) UpdateRoleByID(id int, region tc.Role) (tc.Alerts, ReqInf, in
}
// GetRoles returns a list of roles.
-func (to *Session) GetRoles() ([]tc.Role, ReqInf, int, error) {
- resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, API_ROLES, nil)
+func (to *Session) GetRoles(header http.Header) ([]tc.Role, ReqInf, int, error) {
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, API_ROLES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Role{}, reqInf, http.StatusNotModified, nil
+ }
+ }
+ if resp != nil {
defer resp.Body.Close()
var data tc.RolesResponse
@@ -89,11 +95,17 @@ func (to *Session) GetRoles() ([]tc.Role, ReqInf, int, error) {
}
// GetRoleByID GETs a Role by the Role ID.
-func (to *Session) GetRoleByID(id int) ([]tc.Role, ReqInf, int, error) {
+func (to *Session) GetRoleByID(id int, header http.Header) ([]tc.Role, ReqInf, int, error) {
route := fmt.Sprintf("%s/?id=%d", API_ROLES, id)
- resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Role{}, reqInf, http.StatusNotModified, nil
+ }
+ }
+ if resp != nil {
defer resp.Body.Close()
var data tc.RolesResponse
@@ -106,11 +118,17 @@ func (to *Session) GetRoleByID(id int) ([]tc.Role, ReqInf, int, error) {
}
// GetRoleByName GETs a Role by the Role name.
-func (to *Session) GetRoleByName(name string) ([]tc.Role, ReqInf, int, error) {
+func (to *Session) GetRoleByName(name string, header http.Header) ([]tc.Role, ReqInf, int, error) {
route := fmt.Sprintf("%s?name=%s", API_ROLES, url.QueryEscape(name))
- resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Role{}, reqInf, http.StatusNotModified, nil
+ }
+ }
+ if resp != nil {
defer resp.Body.Close()
var data tc.RolesResponse
@@ -123,14 +141,20 @@ func (to *Session) GetRoleByName(name string) ([]tc.Role, ReqInf, int, error) {
}
// GetRoleByQueryParams gets a Role by the Role query parameters.
-func (to *Session) GetRoleByQueryParams(queryParams map[string]string) ([]tc.Role, ReqInf, int, error) {
+func (to *Session) GetRoleByQueryParams(queryParams map[string]string, header http.Header) ([]tc.Role, ReqInf, int, error) {
route := fmt.Sprintf("%s?", API_ROLES)
for param, val := range queryParams {
route += fmt.Sprintf("%s=%s&", url.QueryEscape(param), url.QueryEscape(val))
}
- resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Role{}, reqInf, http.StatusNotModified, nil
+ }
+ }
+ if resp != nil {
defer resp.Body.Close()
var data tc.RolesResponse
@@ -145,7 +169,7 @@ func (to *Session) GetRoleByQueryParams(queryParams map[string]string) ([]tc.Rol
// DeleteRoleByID DELETEs a Role by ID.
func (to *Session) DeleteRoleByID(id int) (tc.Alerts, ReqInf, int, error) {
route := fmt.Sprintf("%s/?id=%d", API_ROLES, id)
- resp, remoteAddr, errClient := to.RawRequest(http.MethodDelete, route, nil)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
defer resp.Body.Close()
diff --git a/traffic_ops/client/server.go b/traffic_ops/client/server.go
index 6c60c3d..38e8229 100644
--- a/traffic_ops/client/server.go
+++ b/traffic_ops/client/server.go
@@ -46,7 +46,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if needAndCanFetch(server.CachegroupID, server.Cachegroup) {
- cg, _, err := to.GetCacheGroupNullableByName(*server.Cachegroup)
+ cg, _, err := to.GetCacheGroupNullableByName(*server.Cachegroup, nil)
if err != nil {
return alerts, reqInf, fmt.Errorf("no cachegroup named %s: %v", *server.Cachegroup, err)
}
@@ -59,7 +59,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.CachegroupID = cg[0].ID
}
if needAndCanFetch(server.CDNID, server.CDNName) {
- c, _, err := to.GetCDNByName(*server.CDNName)
+ c, _, err := to.GetCDNByName(*server.CDNName, nil)
if err != nil {
return alerts, reqInf, fmt.Errorf("no CDN named %s: %v", *server.CDNName, err)
}
@@ -69,7 +69,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.CDNID = &c[0].ID
}
if needAndCanFetch(server.PhysLocationID, server.PhysLocation) {
- ph, _, err := to.GetPhysLocationByName(*server.PhysLocation)
+ ph, _, err := to.GetPhysLocationByName(*server.PhysLocation, nil)
if err != nil {
return alerts, reqInf, fmt.Errorf("no physlocation named %s: %v", *server.PhysLocation, err)
}
@@ -79,7 +79,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.PhysLocationID = &ph[0].ID
}
if needAndCanFetch(server.ProfileID, server.Profile) {
- pr, _, err := to.GetProfileByName(*server.Profile)
+ pr, _, err := to.GetProfileByName(*server.Profile, nil)
if err != nil {
return alerts, reqInf, fmt.Errorf("no profile named %s: %v", *server.Profile, err)
}
@@ -89,7 +89,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.ProfileID = &pr[0].ID
}
if needAndCanFetch(server.StatusID, server.Status) {
- st, _, err := to.GetStatusByName(*server.Status)
+ st, _, err := to.GetStatusByName(*server.Status, nil)
if err != nil {
return alerts, reqInf, fmt.Errorf("no status named %s: %v", *server.Status, err)
}
@@ -99,7 +99,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
server.StatusID = &st[0].ID
}
if (server.TypeID == nil || *server.TypeID == 0) && server.Type != "" {
- ty, _, err := to.GetTypeByName(server.Type)
+ ty, _, err := to.GetTypeByName(server.Type, nil)
if err != nil {
return alerts, reqInf, fmt.Errorf("no type named %s: %v", server.Type, err)
}
@@ -114,7 +114,7 @@ func (to *Session) CreateServer(server tc.ServerNullable) (tc.Alerts, ReqInf, er
return alerts, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_SERVERS, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_SERVERS, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return alerts, reqInf, err
@@ -137,7 +137,7 @@ func (to *Session) UpdateServerByID(id int, server tc.ServerNullable) (tc.Alerts
}
route := fmt.Sprintf("%s/%d", API_SERVERS, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return alerts, reqInf, err
@@ -153,7 +153,7 @@ func (to *Session) UpdateServerByID(id int, server tc.ServerNullable) (tc.Alerts
// parameters" in the request.
// It returns, in order, the API response that Traffic Ops returned, a request
// info object, and any error that occurred.
-func (to *Session) GetServers(params *url.Values) (tc.ServersV3Response, ReqInf, error) {
+func (to *Session) GetServers(params *url.Values, header http.Header) (tc.ServersV3Response, ReqInf, error) {
route := API_SERVERS
if params != nil {
route += "?" + params.Encode()
@@ -161,8 +161,14 @@ func (to *Session) GetServers(params *url.Values) (tc.ServersV3Response, ReqInf,
var data tc.ServersV3Response
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return tc.ServersV3Response{}, reqInf, nil
+ }
+ }
if err != nil {
return data, reqInf, err
}
@@ -173,13 +179,19 @@ func (to *Session) GetServers(params *url.Values) (tc.ServersV3Response, ReqInf,
}
// GetServerDetailsByHostName GETs Servers by the Server hostname.
-func (to *Session) GetServerDetailsByHostName(hostName string) ([]tc.ServerDetailV30, ReqInf, error) {
+func (to *Session) GetServerDetailsByHostName(hostName string, header http.Header) ([]tc.ServerDetailV30, ReqInf, error) {
v := url.Values{}
v.Add("hostName", hostName)
url := API_SERVERS_DETAILS + "?" + v.Encode()
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.ServerDetailV30{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -196,7 +208,7 @@ func (to *Session) GetServerDetailsByHostName(hostName string) ([]tc.ServerDetai
// DeleteServerByID DELETEs a Server by ID.
func (to *Session) DeleteServerByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_SERVERS, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -209,12 +221,12 @@ func (to *Session) DeleteServerByID(id int) (tc.Alerts, ReqInf, error) {
// GetServerFQDN returns the Fully Qualified Domain Name (FQDN) of the first
// server found to have the Host Name 'n'.
-func (to *Session) GetServerFQDN(n string) (string, tc.Alerts, ReqInf, error) {
+func (to *Session) GetServerFQDN(n string, header http.Header) (string, tc.Alerts, ReqInf, error) {
// TODO fix to only request one server
params := url.Values{}
params.Add("hostName", n)
- resp, reqInf, err := to.GetServers(¶ms)
+ resp, reqInf, err := to.GetServers(¶ms, header)
if err != nil {
return "", resp.Alerts, reqInf, err
}
@@ -235,9 +247,9 @@ func (to *Session) GetServerFQDN(n string) (string, tc.Alerts, ReqInf, error) {
// GetServersShortNameSearch returns all of the Host Names of servers that
// contain 'shortname'.
-func (to *Session) GetServersShortNameSearch(shortname string) ([]string, tc.Alerts, ReqInf, error) {
+func (to *Session) GetServersShortNameSearch(shortname string, header http.Header) ([]string, tc.Alerts, ReqInf, error) {
var serverlst []string
- resp, reqInf, err := to.GetServers(nil)
+ resp, reqInf, err := to.GetServers(nil, header)
if err != nil {
return serverlst, resp.Alerts, reqInf, err
}
@@ -273,7 +285,7 @@ func (to *Session) AssignDeliveryServiceIDsToServerID(server int, dsIDs []int, r
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, endpoint, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, endpoint, reqBody, nil)
if resp != nil {
reqInf.StatusCode = resp.StatusCode
}
@@ -289,10 +301,10 @@ func (to *Session) AssignDeliveryServiceIDsToServerID(server int, dsIDs []int, r
// GetServerIDDeliveryServices returns all of the Delivery Services assigned to the server identified
// by the integral, unique identifier 'server'.
-func (to *Session) GetServerIDDeliveryServices(server int) ([]tc.DeliveryServiceNullable, ReqInf, error) {
+func (to *Session) GetServerIDDeliveryServices(server int, header http.Header) ([]tc.DeliveryServiceNullable, ReqInf, error) {
endpoint := fmt.Sprintf(API_SERVER_DELIVERY_SERVICES, server)
- resp, remoteAddr, err := to.request(http.MethodGet, endpoint, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, endpoint, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -305,9 +317,9 @@ func (to *Session) GetServerIDDeliveryServices(server int) ([]tc.DeliveryService
}
// GetServerUpdateStatus GETs the Server Update Status by the Server hostname.
-func (to *Session) GetServerUpdateStatus(hostName string) (tc.ServerUpdateStatus, ReqInf, error) {
+func (to *Session) GetServerUpdateStatus(hostName string, header http.Header) (tc.ServerUpdateStatus, ReqInf, error) {
path := API_SERVERS + `/` + hostName + `/update_status`
- resp, remoteAddr, err := to.request(http.MethodGet, path, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, path, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.ServerUpdateStatus{}, reqInf, err
diff --git a/traffic_ops/client/server_server_capabilities.go b/traffic_ops/client/server_server_capabilities.go
index a2f9973..d7f48a6 100644
--- a/traffic_ops/client/server_server_capabilities.go
+++ b/traffic_ops/client/server_server_capabilities.go
@@ -19,6 +19,7 @@ import (
"encoding/json"
"fmt"
"net"
+ "net/http"
"net/url"
"strconv"
@@ -56,7 +57,7 @@ func (to *Session) DeleteServerServerCapability(serverID int, serverCapability s
// GetServerServerCapabilities retrieves a list of Server Capabilities that are assigned to a Server
// Callers can filter the results by server id, server host name and/or server capability via the optional parameters
-func (to *Session) GetServerServerCapabilities(serverID *int, serverHostName, serverCapability *string) ([]tc.ServerServerCapability, ReqInf, error) {
+func (to *Session) GetServerServerCapabilities(serverID *int, serverHostName, serverCapability *string, header http.Header) ([]tc.ServerServerCapability, ReqInf, error) {
v := url.Values{}
if serverID != nil {
v.Add("serverId", strconv.Itoa(*serverID))
@@ -75,7 +76,7 @@ func (to *Session) GetServerServerCapabilities(serverID *int, serverHostName, se
resp := struct {
Response []tc.ServerServerCapability `json:"response"`
}{}
- reqInf, err := get(to, queryURL, &resp)
+ reqInf, err := get(to, queryURL, &resp, header)
if err != nil {
return nil, reqInf, err
}
diff --git a/traffic_ops/client/server_update_status.go b/traffic_ops/client/server_update_status.go
index 717f2d5..9e74aec 100644
--- a/traffic_ops/client/server_update_status.go
+++ b/traffic_ops/client/server_update_status.go
@@ -36,7 +36,7 @@ func (to *Session) UpdateServerStatus(serverID int, req tc.ServerPutStatus) (*tc
}
path := fmt.Sprintf("%s/servers/%d/status", apiBase, serverID)
- resp, remoteAddr, err := to.request(http.MethodPut, path, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, path, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return nil, reqInf, err
@@ -70,7 +70,7 @@ func (to *Session) SetServerQueueUpdate(serverID int, queueUpdate bool) (tc.Serv
}
path := fmt.Sprintf("%s/servers/%d/queue_update", apiBase, serverID)
- httpResp, remoteAddr, err := to.request(http.MethodPost, path, reqBody)
+ httpResp, remoteAddr, err := to.request(http.MethodPost, path, reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return resp, reqInf, err
@@ -100,7 +100,7 @@ func (to *Session) SetUpdateServerStatuses(serverName string, updateStatus *bool
}
path += strings.Join(queryParams, `&`)
- resp, remoteAddr, err := to.request(http.MethodPost, path, nil)
+ resp, remoteAddr, err := to.request(http.MethodPost, path, nil, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return reqInf, err
diff --git a/traffic_ops/client/servercapability.go b/traffic_ops/client/servercapability.go
index 4975076..4952a97 100644
--- a/traffic_ops/client/servercapability.go
+++ b/traffic_ops/client/servercapability.go
@@ -37,7 +37,7 @@ func (to *Session) CreateServerCapability(sc tc.ServerCapability) (*tc.ServerCap
if err != nil {
return nil, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_SERVER_CAPABILITIES, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_SERVER_CAPABILITIES, reqBody, nil)
if err != nil {
return nil, reqInf, err
}
@@ -50,9 +50,15 @@ func (to *Session) CreateServerCapability(sc tc.ServerCapability) (*tc.ServerCap
}
// GetServerCapabilities returns all the server capabilities.
-func (to *Session) GetServerCapabilities() ([]tc.ServerCapability, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_SERVER_CAPABILITIES, nil)
+func (to *Session) GetServerCapabilities(header http.Header) ([]tc.ServerCapability, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_SERVER_CAPABILITIES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.ServerCapability{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -67,10 +73,16 @@ func (to *Session) GetServerCapabilities() ([]tc.ServerCapability, ReqInf, error
}
// GetServerCapability returns the given server capability by name.
-func (to *Session) GetServerCapability(name string) (*tc.ServerCapability, ReqInf, error) {
+func (to *Session) GetServerCapability(name string, header http.Header) (*tc.ServerCapability, ReqInf, error) {
reqUrl := fmt.Sprintf("%s?name=%s", API_SERVER_CAPABILITIES, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodGet, reqUrl, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, reqUrl, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return nil, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -90,7 +102,7 @@ func (to *Session) GetServerCapability(name string) (*tc.ServerCapability, ReqIn
// DeleteServerCapability deletes the given server capability by name.
func (to *Session) DeleteServerCapability(name string) (tc.Alerts, ReqInf, error) {
reqUrl := fmt.Sprintf("%s?name=%s", API_SERVER_CAPABILITIES, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodDelete, reqUrl, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, reqUrl, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/servercheck.go b/traffic_ops/client/servercheck.go
index 97942a4..9d981f4 100644
--- a/traffic_ops/client/servercheck.go
+++ b/traffic_ops/client/servercheck.go
@@ -48,6 +48,6 @@ func (to *Session) GetServersChecks() ([]tc.GenericServerCheck, tc.Alerts, ReqIn
Response []tc.GenericServerCheck `json:"response"`
}
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss}
- reqInf, err := get(to, API_SERVERCHECK, &response)
+ reqInf, err := get(to, API_SERVERCHECK, &response, nil)
return response.Response, response.Alerts, reqInf, err
}
diff --git a/traffic_ops/client/servercheckextensions.go b/traffic_ops/client/servercheckextensions.go
index 7d07db9..8676da1 100644
--- a/traffic_ops/client/servercheckextensions.go
+++ b/traffic_ops/client/servercheckextensions.go
@@ -31,7 +31,7 @@ func (to *Session) CreateServerCheckExtension(ServerCheckExtension tc.ServerChec
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_TO_EXTENSION, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_TO_EXTENSION, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -44,7 +44,7 @@ func (to *Session) CreateServerCheckExtension(ServerCheckExtension tc.ServerChec
// DeleteServerCheckExtension deletes a servercheck extension.
func (to *Session) DeleteServerCheckExtension(id int) (tc.Alerts, ReqInf, error) {
URI := fmt.Sprintf("%s/%d", API_TO_EXTENSION, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, URI, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -57,7 +57,7 @@ func (to *Session) DeleteServerCheckExtension(id int) (tc.Alerts, ReqInf, error)
// GetServerCheckExtensions gets all servercheck extensions.
func (to *Session) GetServerCheckExtensions() (tc.ServerCheckExtensionResponse, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_TO_EXTENSION, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, API_TO_EXTENSION, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.ServerCheckExtensionResponse{}, reqInf, err
diff --git a/traffic_ops/client/session.go b/traffic_ops/client/session.go
index db5b4b2..c98cbc4 100644
--- a/traffic_ops/client/session.go
+++ b/traffic_ops/client/session.go
@@ -22,6 +22,7 @@ import (
"encoding/json"
"errors"
"fmt"
+ "github.com/apache/trafficcontrol/grove/web"
"io/ioutil"
"net"
"net/http"
@@ -124,8 +125,8 @@ func (to *Session) login() (net.Addr, error) {
}
path := apiBase + "/user/login"
- resp, remoteAddr, err := to.RawRequest("POST", path, credentials)
- resp, remoteAddr, err = to.ErrUnlessOK(resp, remoteAddr, err, path)
+ resp, remoteAddr, err := to.RawRequest("POST", path, credentials, nil)
+ resp, remoteAddr, err = to.ErrUnlessOKOrNotModified(resp, remoteAddr, err, path)
if err != nil {
return remoteAddr, errors.New("requesting: " + err.Error())
}
@@ -153,8 +154,8 @@ func (to *Session) login() (net.Addr, error) {
func (to *Session) loginWithToken(token []byte) (net.Addr, error) {
path := apiBase + "/user/login/token"
- resp, remoteAddr, err := to.RawRequest(http.MethodPost, path, token)
- resp, remoteAddr, err = to.ErrUnlessOK(resp, remoteAddr, err, path)
+ resp, remoteAddr, err := to.RawRequest(http.MethodPost, path, token, nil)
+ resp, remoteAddr, err = to.ErrUnlessOKOrNotModified(resp, remoteAddr, err, path)
if err != nil {
return remoteAddr, fmt.Errorf("requesting: %v", err)
}
@@ -182,8 +183,8 @@ func (to *Session) logout() (net.Addr, error) {
}
path := apiBase + "/user/logout"
- resp, remoteAddr, err := to.RawRequest("POST", path, credentials)
- resp, remoteAddr, err = to.ErrUnlessOK(resp, remoteAddr, err, path)
+ resp, remoteAddr, err := to.RawRequest("POST", path, credentials, nil)
+ resp, remoteAddr, err = to.ErrUnlessOKOrNotModified(resp, remoteAddr, err, path)
if err != nil {
return remoteAddr, errors.New("requesting: " + err.Error())
}
@@ -307,14 +308,14 @@ func NewNoAuthSession(toURL string, insecure bool, userAgent string, useCache bo
}, useCache)
}
-// ErrUnlessOk returns the response, the remote address, and an error if the given Response's status code is anything
-// but 200 OK. This includes reading the Response.Body and Closing it. Otherwise, the given response, the remote
+// ErrUnlessOKOrNotModified returns the response, the remote address, and an error if the given Response's status code is anything
+// but 200 OK/ 304 Not Modified. This includes reading the Response.Body and Closing it. Otherwise, the given response, the remote
// address, and a nil error are returned.
-func (to *Session) ErrUnlessOK(resp *http.Response, remoteAddr net.Addr, err error, path string) (*http.Response, net.Addr, error) {
+func (to *Session) ErrUnlessOKOrNotModified(resp *http.Response, remoteAddr net.Addr, err error, path string) (*http.Response, net.Addr, error) {
if err != nil {
return resp, remoteAddr, err
}
- if resp.StatusCode < 300 {
+ if resp.StatusCode < 300 || resp.StatusCode == 304 {
return resp, remoteAddr, err
}
@@ -336,27 +337,27 @@ func (to *Session) getURL(path string) string { return to.URL + path }
// request performs the HTTP request to Traffic Ops, trying to refresh the cookie if an Unauthorized or Forbidden code is received. It only tries once. If the login fails, the original Unauthorized/Forbidden response is returned. If the login succeeds and the subsequent re-request fails, the re-request's response is returned even if it's another Unauthorized/Forbidden.
// Returns the response, the remote address of the Traffic Ops instance used, and any error.
// The returned net.Addr is guaranteed to be either nil or valid, even if the returned error is not nil. Callers are encouraged to check and use the net.Addr if an error is returned, and use the remote address in their own error messages. This violates the Go idiom that a non-nil error implies all other values are undefined, but it's more straightforward than alternatives like typecasting.
-func (to *Session) request(method, path string, body []byte) (*http.Response, net.Addr, error) {
- r, remoteAddr, err := to.RawRequest(method, path, body)
+func (to *Session) request(method, path string, body []byte, header http.Header) (*http.Response, net.Addr, error) {
+ r, remoteAddr, err := to.RawRequest(method, path, body, header)
if err != nil {
return r, remoteAddr, err
}
if r.StatusCode != http.StatusUnauthorized && r.StatusCode != http.StatusForbidden {
- return to.ErrUnlessOK(r, remoteAddr, err, path)
+ return to.ErrUnlessOKOrNotModified(r, remoteAddr, err, path)
}
if _, lerr := to.login(); lerr != nil {
- return to.ErrUnlessOK(r, remoteAddr, err, path) // if re-logging-in fails, return the original request's response
+ return to.ErrUnlessOKOrNotModified(r, remoteAddr, err, path) // if re-logging-in fails, return the original request's response
}
// return second request, even if it's another Unauthorized or Forbidden.
- r, remoteAddr, err = to.RawRequest(method, path, body)
- return to.ErrUnlessOK(r, remoteAddr, err, path)
+ r, remoteAddr, err = to.RawRequest(method, path, body, header)
+ return to.ErrUnlessOKOrNotModified(r, remoteAddr, err, path)
}
// RawRequest performs the actual HTTP request to Traffic Ops, simply, without trying to refresh the cookie if an Unauthorized code is returned.
// Returns the response, the remote address of the Traffic Ops instance used, and any error.
// The returned net.Addr is guaranteed to be either nil or valid, even if the returned error is not nil. Callers are encouraged to check and use the net.Addr if an error is returned, and use the remote address in their own error messages. This violates the Go idiom that a non-nil error implies all other values are undefined, but it's more straightforward than alternatives like typecasting.
-func (to *Session) RawRequest(method, path string, body []byte) (*http.Response, net.Addr, error) {
+func (to *Session) RawRequest(method, path string, body []byte, header http.Header) (*http.Response, net.Addr, error) {
url := to.getURL(path)
var req *http.Request
@@ -382,9 +383,8 @@ func (to *Session) RawRequest(method, path string, body []byte) (*http.Response,
},
}
req = req.WithContext(httptrace.WithClientTrace(req.Context(), trace))
-
+ web.CopyHeaderTo(header, &req.Header)
req.Header.Set("User-Agent", to.UserAgentStr)
-
resp, err := to.Client.Do(req)
if err != nil {
return resp, remoteAddr, err
@@ -486,7 +486,7 @@ func (to *Session) getBytesWithTTL(path string, ttl int64) ([]byte, ReqInf, erro
// GetBytes - get []bytes array for a certain path on the to session.
// returns the raw body, the remote address the Traffic Ops URL resolved to, or any error. If the error is not nil, the RemoteAddr may or may not be nil, depending whether the error occurred before the request was executed.
func (to *Session) getBytes(path string) ([]byte, net.Addr, error) {
- resp, remoteAddr, err := to.request("GET", path, nil)
+ resp, remoteAddr, err := to.request("GET", path, nil, nil)
if err != nil {
return nil, remoteAddr, err
}
diff --git a/traffic_ops/client/staticdnsentry.go b/traffic_ops/client/staticdnsentry.go
index ba60d1d..79a719d 100644
--- a/traffic_ops/client/staticdnsentry.go
+++ b/traffic_ops/client/staticdnsentry.go
@@ -31,7 +31,7 @@ const (
func staticDNSEntryIDs(to *Session, sdns *tc.StaticDNSEntry) error {
if sdns.CacheGroupID == 0 && sdns.CacheGroupName != "" {
- p, _, err := to.GetCacheGroupNullableByName(sdns.CacheGroupName)
+ p, _, err := to.GetCacheGroupNullableByName(sdns.CacheGroupName, nil)
if err != nil {
return err
}
@@ -45,7 +45,7 @@ func staticDNSEntryIDs(to *Session, sdns *tc.StaticDNSEntry) error {
}
if sdns.DeliveryServiceID == 0 && sdns.DeliveryService != "" {
- dses, _, err := to.GetDeliveryServiceByXMLIDNullable(sdns.DeliveryService)
+ dses, _, err := to.GetDeliveryServiceByXMLIDNullable(sdns.DeliveryService, nil)
if err != nil {
return err
}
@@ -59,7 +59,7 @@ func staticDNSEntryIDs(to *Session, sdns *tc.StaticDNSEntry) error {
}
if sdns.TypeID == 0 && sdns.Type != "" {
- types, _, err := to.GetTypeByName(sdns.Type)
+ types, _, err := to.GetTypeByName(sdns.Type, nil)
if err != nil {
return err
}
@@ -82,7 +82,7 @@ func (to *Session) CreateStaticDNSEntry(sdns tc.StaticDNSEntry) (tc.Alerts, ReqI
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_STATIC_DNS_ENTRIES, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_STATIC_DNS_ENTRIES, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -103,7 +103,7 @@ func (to *Session) UpdateStaticDNSEntryByID(id int, sdns tc.StaticDNSEntry) (tc.
return tc.Alerts{}, reqInf, 0, err
}
route := fmt.Sprintf("%s?id=%d", API_STATIC_DNS_ENTRIES, id)
- resp, remoteAddr, errClient := to.RawRequest(http.MethodPut, route, reqBody)
+ resp, remoteAddr, errClient := to.RawRequest(http.MethodPut, route, reqBody, nil)
if resp != nil {
defer resp.Body.Close()
var alerts tc.Alerts
@@ -116,9 +116,15 @@ func (to *Session) UpdateStaticDNSEntryByID(id int, sdns tc.StaticDNSEntry) (tc.
}
// GetStaticDNSEntries returns a list of Static DNS Entrys.
-func (to *Session) GetStaticDNSEntries() ([]tc.StaticDNSEntry, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_STATIC_DNS_ENTRIES, nil)
+func (to *Session) GetStaticDNSEntries(header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_STATIC_DNS_ENTRIES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.StaticDNSEntry{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -130,10 +136,16 @@ func (to *Session) GetStaticDNSEntries() ([]tc.StaticDNSEntry, ReqInf, error) {
}
// GetStaticDNSEntryByID GETs a Static DNS Entry by the Static DNS Entry's ID.
-func (to *Session) GetStaticDNSEntryByID(id int) ([]tc.StaticDNSEntry, ReqInf, error) {
+func (to *Session) GetStaticDNSEntryByID(id int, header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_STATIC_DNS_ENTRIES, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.StaticDNSEntry{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -148,10 +160,16 @@ func (to *Session) GetStaticDNSEntryByID(id int) ([]tc.StaticDNSEntry, ReqInf, e
}
// GetStaticDNSEntriesByHost GETs a Static DNS Entry by the Static DNS Entry's host.
-func (to *Session) GetStaticDNSEntriesByHost(host string) ([]tc.StaticDNSEntry, ReqInf, error) {
+func (to *Session) GetStaticDNSEntriesByHost(host string, header http.Header) ([]tc.StaticDNSEntry, ReqInf, error) {
url := fmt.Sprintf("%s?host=%s", API_STATIC_DNS_ENTRIES, host)
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.StaticDNSEntry{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -168,7 +186,7 @@ func (to *Session) GetStaticDNSEntriesByHost(host string) ([]tc.StaticDNSEntry,
// DeleteStaticDNSEntryByID DELETEs a Static DNS Entry by ID.
func (to *Session) DeleteStaticDNSEntryByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_STATIC_DNS_ENTRIES, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/stats_summary.go b/traffic_ops/client/stats_summary.go
index cdf3122..c7e09a2 100644
--- a/traffic_ops/client/stats_summary.go
+++ b/traffic_ops/client/stats_summary.go
@@ -44,7 +44,7 @@ func (to *Session) GetSummaryStats(cdn, deliveryService, statName *string) (tc.S
if len(param) > 0 {
url = fmt.Sprintf("%s?%s", API_STATS_SUMMARY, param.Encode())
}
- reqInf, err := get(to, url, &resp)
+ reqInf, err := get(to, url, &resp, nil)
return resp, reqInf, err
}
@@ -59,7 +59,7 @@ func (to *Session) GetSummaryStatsLastUpdated(statName *string) (tc.StatsSummary
}
url := fmt.Sprintf("%s?%s", API_STATS_SUMMARY, param.Encode())
- reqInf, err := get(to, url, &resp)
+ reqInf, err := get(to, url, &resp, nil)
return resp, reqInf, err
}
diff --git a/traffic_ops/client/status.go b/traffic_ops/client/status.go
index fa7f81a..4012cda 100644
--- a/traffic_ops/client/status.go
+++ b/traffic_ops/client/status.go
@@ -37,7 +37,7 @@ func (to *Session) CreateStatusNullable(status tc.StatusNullable) (tc.Alerts, Re
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_STATUSES, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_STATUSES, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -57,7 +57,7 @@ func (to *Session) UpdateStatusByID(id int, status tc.Status) (tc.Alerts, ReqInf
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_STATUSES, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -68,9 +68,15 @@ func (to *Session) UpdateStatusByID(id int, status tc.Status) (tc.Alerts, ReqInf
}
// GetStatuses returns a list of Statuses.
-func (to *Session) GetStatuses() ([]tc.Status, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, API_STATUSES, nil)
+func (to *Session) GetStatuses(header http.Header) ([]tc.Status, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, API_STATUSES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Status{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -82,10 +88,16 @@ func (to *Session) GetStatuses() ([]tc.Status, ReqInf, error) {
}
// GetStatusByID GETs a Status by the Status ID.
-func (to *Session) GetStatusByID(id int) ([]tc.Status, ReqInf, error) {
+func (to *Session) GetStatusByID(id int, header http.Header) ([]tc.Status, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_STATUSES, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Status{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -100,10 +112,16 @@ func (to *Session) GetStatusByID(id int) ([]tc.Status, ReqInf, error) {
}
// GetStatusByName GETs a Status by the Status name.
-func (to *Session) GetStatusByName(name string) ([]tc.Status, ReqInf, error) {
+func (to *Session) GetStatusByName(name string, header http.Header) ([]tc.Status, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_STATUSES, name)
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Status{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -120,7 +138,7 @@ func (to *Session) GetStatusByName(name string) ([]tc.Status, ReqInf, error) {
// DeleteStatusByID DELETEs a Status by ID.
func (to *Session) DeleteStatusByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_STATUSES, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/steering.go b/traffic_ops/client/steering.go
index 1d1b232..658e1d4 100644
--- a/traffic_ops/client/steering.go
+++ b/traffic_ops/client/steering.go
@@ -22,9 +22,15 @@ import (
"github.com/apache/trafficcontrol/lib/go-tc"
)
-func (to *Session) Steering() ([]tc.Steering, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, apiBase+`/steering`, nil)
+func (to *Session) Steering(header http.Header) ([]tc.Steering, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, apiBase+`/steering`, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Steering{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
diff --git a/traffic_ops/client/steeringtarget.go b/traffic_ops/client/steeringtarget.go
index a855cec..a19d41e 100644
--- a/traffic_ops/client/steeringtarget.go
+++ b/traffic_ops/client/steeringtarget.go
@@ -35,7 +35,7 @@ func (to *Session) CreateSteeringTarget(st tc.SteeringTargetNullable) (tc.Alerts
}
resp := (*http.Response)(nil)
- if resp, reqInf.RemoteAddr, err = to.request(http.MethodPost, apiBase+`/steering/`+strconv.Itoa(int(*st.DeliveryServiceID))+`/targets`, reqBody); err != nil {
+ if resp, reqInf.RemoteAddr, err = to.request(http.MethodPost, apiBase+`/steering/`+strconv.Itoa(int(*st.DeliveryServiceID))+`/targets`, reqBody, nil); err != nil {
return tc.Alerts{}, reqInf, err
}
defer resp.Body.Close()
@@ -58,7 +58,7 @@ func (to *Session) UpdateSteeringTarget(st tc.SteeringTargetNullable) (tc.Alerts
return tc.Alerts{}, reqInf, err
}
resp := (*http.Response)(nil)
- resp, reqInf.RemoteAddr, err = to.request(http.MethodPut, apiBase+`/steering/`+strconv.Itoa(int(*st.DeliveryServiceID))+`/targets/`+strconv.Itoa(int(*st.TargetID)), reqBody)
+ resp, reqInf.RemoteAddr, err = to.request(http.MethodPut, apiBase+`/steering/`+strconv.Itoa(int(*st.DeliveryServiceID))+`/targets/`+strconv.Itoa(int(*st.TargetID)), reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -69,7 +69,7 @@ func (to *Session) UpdateSteeringTarget(st tc.SteeringTargetNullable) (tc.Alerts
}
func (to *Session) GetSteeringTargets(dsID int) ([]tc.SteeringTargetNullable, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, apiBase+`/steering/`+strconv.Itoa(dsID)+`/targets`, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, apiBase+`/steering/`+strconv.Itoa(dsID)+`/targets`, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
@@ -84,7 +84,7 @@ func (to *Session) GetSteeringTargets(dsID int) ([]tc.SteeringTargetNullable, Re
}
func (to *Session) DeleteSteeringTarget(dsID int, targetID int) (tc.Alerts, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodDelete, apiBase+`/steering/`+strconv.Itoa(dsID)+`/targets/`+strconv.Itoa(targetID), nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, apiBase+`/steering/`+strconv.Itoa(dsID)+`/targets/`+strconv.Itoa(targetID), nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/tenant.go b/traffic_ops/client/tenant.go
index 9f8ca7c..3265e6a 100644
--- a/traffic_ops/client/tenant.go
+++ b/traffic_ops/client/tenant.go
@@ -19,6 +19,7 @@ import (
"encoding/json"
"errors"
"fmt"
+ "net/http"
"net/url"
tc "github.com/apache/trafficcontrol/lib/go-tc"
@@ -28,9 +29,12 @@ const API_TENANTS = apiBase + "/tenants"
const API_TENANT_ID = API_TENANTS + "/%v"
// Tenants gets an array of Tenants.
-func (to *Session) Tenants() ([]tc.Tenant, ReqInf, error) {
+func (to *Session) Tenants(header http.Header) ([]tc.Tenant, ReqInf, error) {
var data tc.GetTenantsResponse
- reqInf, err := get(to, API_TENANTS, &data)
+ reqInf, err := get(to, API_TENANTS, &data, header)
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Tenant{}, reqInf, nil
+ }
if err != nil {
return nil, reqInf, err
}
@@ -40,9 +44,12 @@ func (to *Session) Tenants() ([]tc.Tenant, ReqInf, error) {
// Tenant gets the Tenant identified by the passed integral, unique identifer - which
// must be passed as a string.
-func (to *Session) Tenant(id string) (*tc.Tenant, ReqInf, error) {
+func (to *Session) Tenant(id string, header http.Header) (*tc.Tenant, ReqInf, error) {
var data tc.GetTenantsResponse
- reqInf, err := get(to, fmt.Sprintf("%s?id=%v", API_TENANTS, id), &data)
+ reqInf, err := get(to, fmt.Sprintf("%s?id=%v", API_TENANTS, id), &data, header)
+ if reqInf.StatusCode == http.StatusNotModified {
+ return nil, reqInf, nil
+ }
if err != nil {
return nil, reqInf, err
}
@@ -51,10 +58,13 @@ func (to *Session) Tenant(id string) (*tc.Tenant, ReqInf, error) {
}
// TenantByName gets the Tenant with the name it's passed.
-func (to *Session) TenantByName(name string) (*tc.Tenant, ReqInf, error) {
+func (to *Session) TenantByName(name string, header http.Header) (*tc.Tenant, ReqInf, error) {
var data tc.GetTenantsResponse
query := API_TENANTS + "?name=" + url.QueryEscape(name)
- reqInf, err := get(to, query, &data)
+ reqInf, err := get(to, query, &data, header)
+ if reqInf.StatusCode == http.StatusNotModified {
+ return nil, reqInf, nil
+ }
if err != nil {
return nil, reqInf, err
}
@@ -71,7 +81,7 @@ func (to *Session) TenantByName(name string) (*tc.Tenant, ReqInf, error) {
// CreateTenant creates the Tenant it's passed.
func (to *Session) CreateTenant(t *tc.Tenant) (*tc.TenantResponse, error) {
if t.ParentID == 0 && t.ParentName != "" {
- tenant, _, err := to.TenantByName(t.ParentName)
+ tenant, _, err := to.TenantByName(t.ParentName, nil)
if err != nil {
return nil, err
}
diff --git a/traffic_ops/client/topology.go b/traffic_ops/client/topology.go
index bfddda2..c01f3cf 100644
--- a/traffic_ops/client/topology.go
+++ b/traffic_ops/client/topology.go
@@ -36,7 +36,7 @@ func (to *Session) CreateTopology(top tc.Topology) (*tc.TopologyResponse, ReqInf
if err != nil {
return nil, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, ApiTopologies, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, ApiTopologies, reqBody, nil)
if resp != nil {
reqInf.StatusCode = resp.StatusCode
}
@@ -52,8 +52,8 @@ func (to *Session) CreateTopology(top tc.Topology) (*tc.TopologyResponse, ReqInf
}
// GetTopologies returns all topologies.
-func (to *Session) GetTopologies() ([]tc.Topology, ReqInf, error) {
- resp, remoteAddr, err := to.request(http.MethodGet, ApiTopologies, nil)
+func (to *Session) GetTopologies(header http.Header) ([]tc.Topology, ReqInf, error) {
+ resp, remoteAddr, err := to.request(http.MethodGet, ApiTopologies, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
reqInf.StatusCode = resp.StatusCode
@@ -72,9 +72,9 @@ func (to *Session) GetTopologies() ([]tc.Topology, ReqInf, error) {
}
// GetTopology returns the given topology by name.
-func (to *Session) GetTopology(name string) (*tc.Topology, ReqInf, error) {
+func (to *Session) GetTopology(name string, header http.Header) (*tc.Topology, ReqInf, error) {
reqUrl := fmt.Sprintf("%s?name=%s", ApiTopologies, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodGet, reqUrl, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, reqUrl, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
reqInf.StatusCode = resp.StatusCode
@@ -104,7 +104,7 @@ func (to *Session) UpdateTopology(name string, t tc.Topology) (*tc.TopologyRespo
return nil, reqInf, err
}
route := fmt.Sprintf("%s?name=%s", ApiTopologies, name)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if resp != nil {
reqInf.StatusCode = resp.StatusCode
}
@@ -121,7 +121,7 @@ func (to *Session) UpdateTopology(name string, t tc.Topology) (*tc.TopologyRespo
// DeleteTopology deletes the given topology by name.
func (to *Session) DeleteTopology(name string) (tc.Alerts, ReqInf, error) {
reqUrl := fmt.Sprintf("%s?name=%s", ApiTopologies, url.QueryEscape(name))
- resp, remoteAddr, err := to.request(http.MethodDelete, reqUrl, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, reqUrl, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if resp != nil {
reqInf.StatusCode = resp.StatusCode
diff --git a/traffic_ops/client/traffic_monitor.go b/traffic_ops/client/traffic_monitor.go
index 7bdc539..81c96b1 100644
--- a/traffic_ops/client/traffic_monitor.go
+++ b/traffic_ops/client/traffic_monitor.go
@@ -49,7 +49,7 @@ func (to *Session) GetTrafficMonitorConfigMap(cdn string) (*tc.TrafficMonitorCon
// GetTrafficMonitorConfig returns the monitoring configuration for the CDN named by 'cdn'.
func (to *Session) GetTrafficMonitorConfig(cdn string) (*tc.TrafficMonitorConfig, ReqInf, error) {
url := fmt.Sprintf(API_CDN_MONITORING_CONFIG, cdn)
- resp, remoteAddr, err := to.request("GET", url, nil)
+ resp, remoteAddr, err := to.request("GET", url, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return nil, reqInf, err
diff --git a/traffic_ops/client/traffic_stats.go b/traffic_ops/client/traffic_stats.go
index 8f163d9..7c1ad48 100644
--- a/traffic_ops/client/traffic_stats.go
+++ b/traffic_ops/client/traffic_stats.go
@@ -21,7 +21,7 @@ import (
// GetCurrentStats gets current stats for each CDNs and a total across them
func (to *Session) GetCurrentStats() (tc.TrafficStatsCDNStatsResponse, ReqInf, error) {
resp := tc.TrafficStatsCDNStatsResponse{}
- reqInf, err := get(to, apiBase+"/current_stats", &resp)
+ reqInf, err := get(to, apiBase+"/current_stats", &resp, nil)
if err != nil {
return resp, reqInf, err
}
diff --git a/traffic_ops/client/type.go b/traffic_ops/client/type.go
index a610255..0be0145 100644
--- a/traffic_ops/client/type.go
+++ b/traffic_ops/client/type.go
@@ -38,7 +38,7 @@ func (to *Session) CreateType(typ tc.Type) (tc.Alerts, ReqInf, error) {
if err != nil {
return tc.Alerts{}, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, API_TYPES, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, API_TYPES, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -58,7 +58,7 @@ func (to *Session) UpdateTypeByID(id int, typ tc.Type) (tc.Alerts, ReqInf, error
return tc.Alerts{}, reqInf, err
}
route := fmt.Sprintf("%s/%d", API_TYPES, id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return tc.Alerts{}, reqInf, err
}
@@ -71,13 +71,19 @@ func (to *Session) UpdateTypeByID(id int, typ tc.Type) (tc.Alerts, ReqInf, error
// GetTypes returns a list of Types. If a 'useInTable' parameter is passed, the returned Types
// are restricted to those with that exact 'useInTable' property. Only exactly 1 or exactly 0
// 'useInTable' parameters may be passed; passing more will result in an error being returned.
-func (to *Session) GetTypes(useInTable ...string) ([]tc.Type, ReqInf, error) {
+func (to *Session) GetTypes(header http.Header, useInTable ...string) ([]tc.Type, ReqInf, error) {
if len(useInTable) > 1 {
return nil, ReqInf{}, errors.New("Please pass in a single value for the 'useInTable' parameter")
}
- resp, remoteAddr, err := to.request("GET", API_TYPES, nil)
+ resp, remoteAddr, err := to.request("GET", API_TYPES, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Type{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -103,10 +109,16 @@ func (to *Session) GetTypes(useInTable ...string) ([]tc.Type, ReqInf, error) {
}
// GetTypeByID GETs a Type by the Type ID.
-func (to *Session) GetTypeByID(id int) ([]tc.Type, ReqInf, error) {
+func (to *Session) GetTypeByID(id int, header http.Header) ([]tc.Type, ReqInf, error) {
route := fmt.Sprintf("%s?id=%d", API_TYPES, id)
- resp, remoteAddr, err := to.request(http.MethodGet, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, route, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Type{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -121,10 +133,16 @@ func (to *Session) GetTypeByID(id int) ([]tc.Type, ReqInf, error) {
}
// GetTypeByName GET a Type by the Type name.
-func (to *Session) GetTypeByName(name string) ([]tc.Type, ReqInf, error) {
+func (to *Session) GetTypeByName(name string, header http.Header) ([]tc.Type, ReqInf, error) {
url := fmt.Sprintf("%s?name=%s", API_TYPES, name)
- resp, remoteAddr, err := to.request(http.MethodGet, url, nil)
+ resp, remoteAddr, err := to.request(http.MethodGet, url, nil, header)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
+ if resp != nil {
+ reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return []tc.Type{}, reqInf, nil
+ }
+ }
if err != nil {
return nil, reqInf, err
}
@@ -141,7 +159,7 @@ func (to *Session) GetTypeByName(name string) ([]tc.Type, ReqInf, error) {
// DeleteTypeByID DELETEs a Type by ID.
func (to *Session) DeleteTypeByID(id int) (tc.Alerts, ReqInf, error) {
route := fmt.Sprintf("%s/%d", API_TYPES, id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
diff --git a/traffic_ops/client/user.go b/traffic_ops/client/user.go
index ebea67b..39a1124 100644
--- a/traffic_ops/client/user.go
+++ b/traffic_ops/client/user.go
@@ -29,40 +29,40 @@ import (
)
// GetUsers returns all users accessible from current user
-func (to *Session) GetUsers() ([]tc.User, ReqInf, error) {
+func (to *Session) GetUsers(header http.Header) ([]tc.User, ReqInf, error) {
data := tc.UsersResponse{}
route := fmt.Sprintf("%s/users", apiBase)
- inf, err := get(to, route, &data)
+ inf, err := get(to, route, &data, header)
return data.Response, inf, err
}
// GetUsersByRole returns all users accessible from current user for a given role
-func (to *Session) GetUsersByRole(roleName string) ([]tc.User, ReqInf, error) {
+func (to *Session) GetUsersByRole(roleName string, header http.Header) ([]tc.User, ReqInf, error) {
data := tc.UsersResponse{}
route := fmt.Sprintf("%s/users?role=%s", apiBase, url.QueryEscape(roleName))
- inf, err := get(to, route, &data)
+ inf, err := get(to, route, &data, header)
return data.Response, inf, err
}
-func (to *Session) GetUserByID(id int) ([]tc.User, ReqInf, error) {
+func (to *Session) GetUserByID(id int, header http.Header) ([]tc.User, ReqInf, error) {
data := tc.UsersResponse{}
route := fmt.Sprintf("%s/users/%d", apiBase, id)
- inf, err := get(to, route, &data)
+ inf, err := get(to, route, &data, header)
return data.Response, inf, err
}
-func (to *Session) GetUserByUsername(username string) ([]tc.User, ReqInf, error) {
+func (to *Session) GetUserByUsername(username string, header http.Header) ([]tc.User, ReqInf, error) {
data := tc.UsersResponse{}
route := fmt.Sprintf("%s/users?username=%s", apiBase, username)
- inf, err := get(to, route, &data)
+ inf, err := get(to, route, &data, header)
return data.Response, inf, err
}
// GetUserCurrent gets information about the current user
-func (to *Session) GetUserCurrent() (*tc.UserCurrent, ReqInf, error) {
+func (to *Session) GetUserCurrent(header http.Header) (*tc.UserCurrent, ReqInf, error) {
route := apiBase + `/user/current`
resp := tc.UserCurrentResponse{}
- reqInf, err := get(to, route, &resp)
+ reqInf, err := get(to, route, &resp, header)
if err != nil {
return nil, reqInf, err
}
@@ -83,7 +83,7 @@ func (to *Session) UpdateCurrentUser(u tc.User) (*tc.UpdateUserResponse, ReqInf,
}
var resp *http.Response
- resp, reqInf.RemoteAddr, err = to.request(http.MethodPut, apiBase+"/user/current", reqBody)
+ resp, reqInf.RemoteAddr, err = to.request(http.MethodPut, apiBase+"/user/current", reqBody, nil)
if err != nil {
return nil, reqInf, err
}
@@ -97,7 +97,7 @@ func (to *Session) UpdateCurrentUser(u tc.User) (*tc.UpdateUserResponse, ReqInf,
// CreateUser creates a user
func (to *Session) CreateUser(user *tc.User) (*tc.CreateUserResponse, ReqInf, error) {
if user.TenantID == nil && user.Tenant != nil {
- tenant, _, err := to.TenantByName(*user.Tenant)
+ tenant, _, err := to.TenantByName(*user.Tenant, nil)
if err != nil {
return nil, ReqInf{}, err
}
@@ -111,7 +111,7 @@ func (to *Session) CreateUser(user *tc.User) (*tc.CreateUserResponse, ReqInf, er
}
if user.RoleName != nil && *user.RoleName != "" {
- roles, _, _, err := to.GetRoleByName(*user.RoleName)
+ roles, _, _, err := to.GetRoleByName(*user.RoleName, nil)
if err != nil {
return nil, ReqInf{}, err
}
@@ -131,7 +131,7 @@ func (to *Session) CreateUser(user *tc.User) (*tc.CreateUserResponse, ReqInf, er
return nil, reqInf, err
}
route := apiBase + "/users"
- resp, remoteAddr, err := to.request(http.MethodPost, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, route, reqBody, nil)
if err != nil {
return nil, reqInf, err
}
@@ -151,7 +151,7 @@ func (to *Session) UpdateUserByID(id int, u *tc.User) (*tc.UpdateUserResponse, R
return nil, reqInf, err
}
route := apiBase + "/users/" + strconv.Itoa(id)
- resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPut, route, reqBody, nil)
if err != nil {
return nil, reqInf, err
}
@@ -164,7 +164,7 @@ func (to *Session) UpdateUserByID(id int, u *tc.User) (*tc.UpdateUserResponse, R
// DeleteUserByID updates user with the given id
func (to *Session) DeleteUserByID(id int) (tc.Alerts, ReqInf, error) {
route := apiBase + "/users/" + strconv.Itoa(id)
- resp, remoteAddr, err := to.request(http.MethodDelete, route, nil)
+ resp, remoteAddr, err := to.request(http.MethodDelete, route, nil, nil)
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
if err != nil {
return tc.Alerts{}, reqInf, err
@@ -190,7 +190,7 @@ func (to *Session) RegisterNewUser(tenantID uint, roleID uint, email rfc.EmailAd
return alerts, reqInf, err
}
- resp, remoteAddr, err := to.request(http.MethodPost, apiBase+"/users/register", reqBody)
+ resp, remoteAddr, err := to.request(http.MethodPost, apiBase+"/users/register", reqBody, nil)
reqInf.RemoteAddr = remoteAddr
if err != nil {
return alerts, reqInf, err
diff --git a/traffic_ops/client/util.go b/traffic_ops/client/util.go
index 72d6d9e..19fe9d2 100644
--- a/traffic_ops/client/util.go
+++ b/traffic_ops/client/util.go
@@ -19,31 +19,35 @@ import (
"encoding/json"
"errors"
"io/ioutil"
+ "net/http"
"github.com/apache/trafficcontrol/lib/go-log"
)
-func get(to *Session, endpoint string, respStruct interface{}) (ReqInf, error) {
- return makeReq(to, "GET", endpoint, nil, respStruct)
+func get(to *Session, endpoint string, respStruct interface{}, header http.Header) (ReqInf, error) {
+ return makeReq(to, "GET", endpoint, nil, respStruct, header)
}
func post(to *Session, endpoint string, body []byte, respStruct interface{}) (ReqInf, error) {
- return makeReq(to, "POST", endpoint, body, respStruct)
+ return makeReq(to, "POST", endpoint, body, respStruct, nil)
}
func put(to *Session, endpoint string, body []byte, respStruct interface{}) (ReqInf, error) {
- return makeReq(to, "PUT", endpoint, body, respStruct)
+ return makeReq(to, "PUT", endpoint, body, respStruct, nil)
}
func del(to *Session, endpoint string, respStruct interface{}) (ReqInf, error) {
- return makeReq(to, "DELETE", endpoint, nil, respStruct)
+ return makeReq(to, "DELETE", endpoint, nil, respStruct, nil)
}
-func makeReq(to *Session, method, endpoint string, body []byte, respStruct interface{}) (ReqInf, error) {
- resp, remoteAddr, err := to.request(method, endpoint, body) // TODO change to getBytesWithTTL
+func makeReq(to *Session, method, endpoint string, body []byte, respStruct interface{}, header http.Header) (ReqInf, error) {
+ resp, remoteAddr, err := to.request(method, endpoint, body, header) // TODO change to getBytesWithTTL
reqInf := ReqInf{RemoteAddr: remoteAddr, CacheHitStatus: CacheHitStatusMiss}
if resp != nil {
reqInf.StatusCode = resp.StatusCode
+ if reqInf.StatusCode == http.StatusNotModified {
+ return reqInf, nil
+ }
}
if err != nil {
return reqInf, err
diff --git a/traffic_ops/testing/api/conf/traffic-ops-test.conf b/traffic_ops/testing/api/conf/traffic-ops-test.conf
index e443d59..2d38297 100644
--- a/traffic_ops/testing/api/conf/traffic-ops-test.conf
+++ b/traffic_ops/testing/api/conf/traffic-ops-test.conf
@@ -12,6 +12,7 @@
},
"includeSystemTests": false
},
+ "use_ims": true,
"trafficOps": {
"URL": "https://localhost:8443",
"password": "twelve",
diff --git a/traffic_ops/testing/api/config/config.go b/traffic_ops/testing/api/config/config.go
index 0574133..d136614 100644
--- a/traffic_ops/testing/api/config/config.go
+++ b/traffic_ops/testing/api/config/config.go
@@ -37,6 +37,7 @@ type Config struct {
TrafficOps TrafficOps `json:"trafficOps"`
TrafficOpsDB TrafficOpsDB `json:"trafficOpsDB"`
Default Default `json:"default"`
+ UseIMS bool `json:"use_ims"`
}
// TrafficOps - config section
diff --git a/traffic_ops/testing/api/v3/cachegroups_parameters_test.go b/traffic_ops/testing/api/v3/cachegroups_parameters_test.go
index 1ba8f2e..e0ea3a1 100644
--- a/traffic_ops/testing/api/v3/cachegroups_parameters_test.go
+++ b/traffic_ops/testing/api/v3/cachegroups_parameters_test.go
@@ -17,7 +17,10 @@ package v3
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -25,13 +28,14 @@ import (
func TestCacheGroupParameters(t *testing.T) {
WithObjs(t, []TCObj{Types, Parameters, CacheGroups, CacheGroupParameters}, func() {
GetTestCacheGroupParameters(t)
+ GetTestCacheGroupParametersIMS(t)
})
}
func CreateTestCacheGroupParameters(t *testing.T) {
// Get Cache Group to assign parameter to
firstCacheGroup := testData.CacheGroups[0]
- cacheGroupResp, _, err := TOSession.GetCacheGroupNullableByName(*firstCacheGroup.Name)
+ cacheGroupResp, _, err := TOSession.GetCacheGroupNullableByName(*firstCacheGroup.Name, nil)
if err != nil {
t.Errorf("cannot GET Cache Group by name: %v - %v", firstCacheGroup.Name, err)
}
@@ -41,7 +45,7 @@ func CreateTestCacheGroupParameters(t *testing.T) {
// Get Parameter to assign to Cache Group
firstParameter := testData.Parameters[0]
- paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name)
+ paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name, nil)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", firstParameter.Name, err)
}
@@ -64,7 +68,7 @@ func CreateTestCacheGroupParameters(t *testing.T) {
func GetTestCacheGroupParameters(t *testing.T) {
for _, cgp := range testData.CacheGroupParameterRequests {
- resp, _, err := TOSession.GetCacheGroupParameters(cgp.CacheGroupID)
+ resp, _, err := TOSession.GetCacheGroupParameters(cgp.CacheGroupID, nil)
if err != nil {
t.Errorf("cannot GET Parameter by cache group: %v - %v", err, resp)
}
@@ -74,6 +78,23 @@ func GetTestCacheGroupParameters(t *testing.T) {
}
}
+func GetTestCacheGroupParametersIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, cgp := range testData.CacheGroupParameterRequests {
+ _, reqInf, err := TOSession.GetCacheGroupParameters(cgp.CacheGroupID, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func DeleteTestCacheGroupParameters(t *testing.T) {
for _, cgp := range testData.CacheGroupParameterRequests {
DeleteTestCacheGroupParameter(t, cgp)
@@ -90,7 +111,7 @@ func DeleteTestCacheGroupParameter(t *testing.T, cgp tc.CacheGroupParameterReque
// Retrieve the Cache Group Parameter to see if it got deleted
queryParams := fmt.Sprintf("?parameterId=%d", cgp.ParameterID)
- parameters, _, err := TOSession.GetCacheGroupParametersByQueryParams(cgp.CacheGroupID, queryParams)
+ parameters, _, err := TOSession.GetCacheGroupParametersByQueryParams(cgp.CacheGroupID, queryParams, nil)
if err != nil {
t.Errorf("error deleting Parameter name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/cachegroups_test.go b/traffic_ops/testing/api/v3/cachegroups_test.go
index a170777..5921746 100644
--- a/traffic_ops/testing/api/v3/cachegroups_test.go
+++ b/traffic_ops/testing/api/v3/cachegroups_test.go
@@ -17,24 +17,106 @@ package v3
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"net/url"
"reflect"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
func TestCacheGroups(t *testing.T) {
WithObjs(t, []TCObj{Types, Parameters, CacheGroups, Topologies}, func() {
+ GetTestCacheGroupsIMS(t)
+ GetTestCacheGroupsByNameIMS(t)
+ GetTestCacheGroupsByShortNameIMS(t)
GetTestCacheGroups(t)
GetTestCacheGroupsByName(t)
GetTestCacheGroupsByShortName(t)
GetTestCacheGroupsByTopology(t)
CheckCacheGroupsAuthentication(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestCacheGroups(t)
+ GetTestCacheGroupsAfterChangeIMS(t, header)
})
}
+func GetTestCacheGroupsAfterChangeIMS(t *testing.T, header http.Header) {
+ _, reqInf, err := TOSession.GetCacheGroupsByQueryParams(url.Values{}, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ _, reqInf, err = TOSession.GetCacheGroupsByQueryParams(url.Values{}, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
+func GetTestCacheGroupsByShortNameIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, cg := range testData.CacheGroups {
+ _, reqInf, err := TOSession.GetCacheGroupNullableByShortName(*cg.ShortName, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestCacheGroupsByNameIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, cg := range testData.CacheGroups {
+ _, reqInf, err := TOSession.GetCacheGroupNullableByName(*cg.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestCacheGroupsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetCacheGroupsByQueryParams(url.Values{}, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func CreateTestCacheGroups(t *testing.T) {
var err error
@@ -69,7 +151,7 @@ func CreateTestCacheGroups(t *testing.T) {
}
func GetTestCacheGroups(t *testing.T) {
- resp, _, err := TOSession.GetCacheGroupsByQueryParams(url.Values{})
+ resp, _, err := TOSession.GetCacheGroupsByQueryParams(url.Values{}, nil)
if err != nil {
t.Errorf("cannot GET CacheGroups %v - %v", err, resp)
}
@@ -92,7 +174,7 @@ func GetTestCacheGroups(t *testing.T) {
func GetTestCacheGroupsByName(t *testing.T) {
for _, cg := range testData.CacheGroups {
- resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: %v - %v", err, resp)
}
@@ -104,7 +186,7 @@ func GetTestCacheGroupsByName(t *testing.T) {
func GetTestCacheGroupsByShortName(t *testing.T) {
for _, cg := range testData.CacheGroups {
- resp, _, err := TOSession.GetCacheGroupNullableByShortName(*cg.ShortName)
+ resp, _, err := TOSession.GetCacheGroupNullableByShortName(*cg.ShortName, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by shortName: %v - %v", err, resp)
}
@@ -118,7 +200,7 @@ func GetTestCacheGroupsByTopology(t *testing.T) {
for _, top := range testData.Topologies {
qparams := url.Values{}
qparams.Set("topology", top.Name)
- resp, _, err := TOSession.GetCacheGroupsByQueryParams(qparams)
+ resp, _, err := TOSession.GetCacheGroupsByQueryParams(qparams, nil)
if err != nil {
t.Errorf("cannot GET CacheGroups by topology: %v - %v", err, resp)
}
@@ -141,7 +223,7 @@ func topologyCachegroups(top tc.Topology) map[string]struct{} {
func UpdateTestCacheGroups(t *testing.T) {
firstCG := testData.CacheGroups[0]
- resp, _, err := TOSession.GetCacheGroupNullableByName(*firstCG.Name)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*firstCG.Name, nil)
if err != nil {
t.Errorf("cannot GET CACHEGROUP by name: %v - %v", *firstCG.Name, err)
}
@@ -150,7 +232,7 @@ func UpdateTestCacheGroups(t *testing.T) {
cg.ShortName = &expectedShortName
// fix the type id for test
- typeResp, _, err := TOSession.GetTypeByID(*cg.TypeID)
+ typeResp, _, err := TOSession.GetTypeByID(*cg.TypeID, nil)
if err != nil {
t.Error("could not lookup a typeID for this cachegroup")
}
@@ -179,7 +261,7 @@ func UpdateTestCacheGroups(t *testing.T) {
}
// Retrieve the CacheGroup to check CacheGroup name got updated
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: '%s', %v", *firstCG.Name, err)
}
@@ -198,7 +280,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -218,7 +300,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -231,7 +313,7 @@ func UpdateTestCacheGroups(t *testing.T) {
// Retrieve the CacheGroup to check CacheGroup name got updated
firstEdgeCGName := "cachegroup1"
- resp, _, err = TOSession.GetCacheGroupNullableByName(firstEdgeCGName)
+ resp, _, err = TOSession.GetCacheGroupNullableByName(firstEdgeCGName, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: '$%s', %v", firstEdgeCGName, err)
}
@@ -248,7 +330,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -265,7 +347,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v)", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -282,7 +364,7 @@ func UpdateTestCacheGroups(t *testing.T) {
t.Errorf("cannot UPDATE CacheGroup by id: %v - %v", err, updResp)
}
- resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID)
+ resp, _, err = TOSession.GetCacheGroupNullableByID(*cg.ID, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by id: '%d', %v", *cg.ID, err)
}
@@ -298,7 +380,7 @@ func DeleteTestCacheGroups(t *testing.T) {
// delete the edge caches.
for _, cg := range testData.CacheGroups {
// Retrieve the CacheGroup by name so we can get the id for the Update
- resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: %v - %v", *cg.Name, err)
}
@@ -317,7 +399,7 @@ func DeleteTestCacheGroups(t *testing.T) {
t.Errorf("cannot DELETE CacheGroup by name: '%s' %v", *respCG.Name, err)
}
// Retrieve the CacheGroup to see if it got deleted
- cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
+ cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
if err != nil {
t.Errorf("error deleting CacheGroup by name: %s", err.Error())
}
@@ -330,7 +412,7 @@ func DeleteTestCacheGroups(t *testing.T) {
// now delete the parentless cachegroups
for _, cg := range parentlessCacheGroups {
// Retrieve the CacheGroup by name so we can get the id for the Update
- resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: %v - %v", *cg.Name, err)
}
@@ -342,7 +424,7 @@ func DeleteTestCacheGroups(t *testing.T) {
}
// Retrieve the CacheGroup to see if it got deleted
- cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
+ cgs, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
if err != nil {
t.Errorf("error deleting CacheGroup name: %s", err.Error())
}
@@ -358,7 +440,7 @@ func CheckCacheGroupsAuthentication(t *testing.T) {
cg := testData.CacheGroups[0]
- resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name)
+ resp, _, err := TOSession.GetCacheGroupNullableByName(*cg.Name, nil)
if err != nil {
t.Errorf("cannot GET CacheGroup by name: %v - %v", *cg.Name, err)
}
@@ -367,13 +449,13 @@ func CheckCacheGroupsAuthentication(t *testing.T) {
if _, _, err = NoAuthTOSession.CreateCacheGroupNullable(cg); err == nil {
t.Error(fmt.Errorf(errFormat, "CreateCacheGroup"))
}
- if _, _, err = NoAuthTOSession.GetCacheGroupsNullable(); err == nil {
+ if _, _, err = NoAuthTOSession.GetCacheGroupsNullable(nil); err == nil {
t.Error(fmt.Errorf(errFormat, "GetCacheGroups"))
}
- if _, _, err = NoAuthTOSession.GetCacheGroupNullableByName(*cg.Name); err == nil {
+ if _, _, err = NoAuthTOSession.GetCacheGroupNullableByName(*cg.Name, nil); err == nil {
t.Error(fmt.Errorf(errFormat, "GetCacheGroupByName"))
}
- if _, _, err = NoAuthTOSession.GetCacheGroupNullableByID(*cg.ID); err == nil {
+ if _, _, err = NoAuthTOSession.GetCacheGroupNullableByID(*cg.ID, nil); err == nil {
t.Error(fmt.Errorf(errFormat, "GetCacheGroupByID"))
}
if _, _, err = NoAuthTOSession.UpdateCacheGroupNullableByID(*cg.ID, cg); err == nil {
diff --git a/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go b/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go
index 5af55dc..d4d9f00 100644
--- a/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go
+++ b/traffic_ops/testing/api/v3/cachegroupsdeliveryservices_test.go
@@ -40,12 +40,12 @@ func CreateTestCachegroupsDeliveryServices(t *testing.T) {
t.Fatalf("cannot test cachegroups delivery services: expected no initial delivery service servers, actual %v", len(dss.Response))
}
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v - %v", err, dses)
}
- clientCGs, _, err := TOSession.GetCacheGroupNullableByName(TestEdgeServerCacheGroupName)
+ clientCGs, _, err := TOSession.GetCacheGroupNullableByName(TestEdgeServerCacheGroupName, nil)
if err != nil {
t.Fatalf("getting cachegroup: %v", err)
}
@@ -107,7 +107,7 @@ func CreateTestCachegroupsDeliveryServices(t *testing.T) {
params := url.Values{}
for _, serverName := range resp.Response.ServerNames {
params.Set("hostName", string(serverName))
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("getting server: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/capabilities_test.go b/traffic_ops/testing/api/v3/capabilities_test.go
index 32c2c35..68883db 100644
--- a/traffic_ops/testing/api/v3/capabilities_test.go
+++ b/traffic_ops/testing/api/v3/capabilities_test.go
@@ -21,7 +21,10 @@ package v3
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -57,6 +60,7 @@ var staticCapabilities = []tc.Capability{
func TestCapabilities(t *testing.T) {
CreateTestCapabilities(t)
+ GetTestCapabilitiesIMS(t)
GetTestCapabilities(t)
}
@@ -76,13 +80,34 @@ func CreateTestCapabilities(t *testing.T) {
}
}
+func GetTestCapabilitiesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ testDataLen := len(testData.Capabilities) + len(staticCapabilities)
+ capMap := make(map[string]string, testDataLen)
+
+ for _, c := range testData.Capabilities {
+ capMap[c.Name] = c.Description
+ _, reqInf, err := TOSession.GetCapability(c.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func GetTestCapabilities(t *testing.T) {
testDataLen := len(testData.Capabilities) + len(staticCapabilities)
capMap := make(map[string]string, testDataLen)
for _, c := range testData.Capabilities {
capMap[c.Name] = c.Description
- cap, _, err := TOSession.GetCapability(c.Name)
+ cap, _, err := TOSession.GetCapability(c.Name, nil)
if err != nil {
t.Errorf("could not get capability '%s': %v", c.Name, err)
continue
@@ -101,7 +126,7 @@ func GetTestCapabilities(t *testing.T) {
capMap[c.Name] = c.Description
}
- caps, _, err := TOSession.GetCapabilities()
+ caps, _, err := TOSession.GetCapabilities(nil)
if err != nil {
t.Fatalf("could not get all capabilities: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/cdn_domains_test.go b/traffic_ops/testing/api/v3/cdn_domains_test.go
index 26928ea..426bd99 100644
--- a/traffic_ops/testing/api/v3/cdn_domains_test.go
+++ b/traffic_ops/testing/api/v3/cdn_domains_test.go
@@ -16,19 +16,38 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
)
func GetTestDomains(t *testing.T) {
- resp, _, err := TOSession.GetDomains()
+ resp, _, err := TOSession.GetDomains(nil)
t.Log("Response: ", resp)
if err != nil {
t.Errorf("could not GET domains: %v", err)
}
}
+func GetTestDomainsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetDomains(header)
+ if err != nil {
+ t.Fatalf("could not GET domains: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func TestDomains(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Parameters, Profiles, Statuses}, func() {
GetTestDomains(t)
+ GetTestDomainsIMS(t)
})
}
diff --git a/traffic_ops/testing/api/v3/cdnfederations_test.go b/traffic_ops/testing/api/v3/cdnfederations_test.go
index 242bfdc..1fb40d5 100644
--- a/traffic_ops/testing/api/v3/cdnfederations_test.go
+++ b/traffic_ops/testing/api/v3/cdnfederations_test.go
@@ -17,10 +17,9 @@ package v3
import (
"encoding/json"
+ "github.com/apache/trafficcontrol/lib/go-log"
"strings"
"testing"
-
- "github.com/apache/trafficcontrol/lib/go-log"
)
var fedIDs []int
@@ -68,7 +67,7 @@ func CreateTestCDNFederations(t *testing.T) {
func UpdateTestCDNFederations(t *testing.T) {
for _, id := range fedIDs {
- fed, _, err := TOSession.GetCDNFederationsByID("foo", id)
+ fed, _, err := TOSession.GetCDNFederationsByID("foo", id, nil)
if err != nil {
t.Errorf("cannot GET federation by id: %v", err)
}
@@ -82,7 +81,7 @@ func UpdateTestCDNFederations(t *testing.T) {
bytes, _ := json.Marshal(resp)
t.Logf("PUT Response: %s\n", bytes)
- resp2, _, err := TOSession.GetCDNFederationsByID("foo", id)
+ resp2, _, err := TOSession.GetCDNFederationsByID("foo", id, nil)
if err != nil {
t.Errorf("cannot GET federation by id after PUT: %v", err)
}
@@ -106,7 +105,7 @@ func GetTestCDNFederations(t *testing.T) {
// clean up fedIDs connection?)
for _, id := range fedIDs {
- data, _, err := TOSession.GetCDNFederationsByID("foo", id)
+ data, _, err := TOSession.GetCDNFederationsByID("foo", id, nil)
if err != nil {
t.Errorf("could not GET federations: " + err.Error())
}
@@ -126,7 +125,7 @@ func AssignTestFederationFederationResolvers(t *testing.T) {
t.Fatal("not enough federation resolvers to test")
}
- frs, _, err := TOSession.GetFederationResolvers()
+ frs, _, err := TOSession.GetFederationResolvers(nil)
if err != nil {
t.Fatalf("Unexpected error getting Federation Resolvers: %v", err)
}
@@ -234,7 +233,7 @@ func DeleteTestCDNFederations(t *testing.T) {
bytes, err := json.Marshal(resp)
t.Logf("DELETE Response: %s\n", bytes)
- data, _, err := TOSession.GetCDNFederationsByID("foo", id)
+ data, _, err := TOSession.GetCDNFederationsByID("foo", id, nil)
if len(data.Response) != 0 {
t.Error("expected federation to be deleted")
}
diff --git a/traffic_ops/testing/api/v3/cdns_test.go b/traffic_ops/testing/api/v3/cdns_test.go
index 494160d..8b5bd30 100644
--- a/traffic_ops/testing/api/v3/cdns_test.go
+++ b/traffic_ops/testing/api/v3/cdns_test.go
@@ -16,18 +16,70 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
tc "github.com/apache/trafficcontrol/lib/go-tc"
)
func TestCDNs(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Parameters}, func() {
+ GetTestCDNsIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestCDNs(t)
GetTestCDNs(t)
+ GetTestCDNsIMSAfterChange(t, header)
})
}
+func GetTestCDNsIMSAfterChange(t *testing.T, header http.Header) {
+ for _, cdn := range testData.CDNs {
+ _, reqInf, err := TOSession.GetCDNByName(cdn.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, cdn := range testData.CDNs {
+ _, reqInf, err := TOSession.GetCDNByName(cdn.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestCDNsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ for _, cdn := range testData.CDNs {
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetCDNByName(cdn.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestCDNs(t *testing.T) {
for _, cdn := range testData.CDNs {
@@ -44,7 +96,7 @@ func UpdateTestCDNs(t *testing.T) {
firstCDN := testData.CDNs[0]
// Retrieve the CDN by name so we can get the id for the Update
- resp, _, err := TOSession.GetCDNByName(firstCDN.Name)
+ resp, _, err := TOSession.GetCDNByName(firstCDN.Name, nil)
if err != nil {
t.Errorf("cannot GET CDN by name: '%s', %v", firstCDN.Name, err)
}
@@ -58,7 +110,7 @@ func UpdateTestCDNs(t *testing.T) {
}
// Retrieve the CDN to check CDN name got updated
- resp, _, err = TOSession.GetCDNByID(remoteCDN.ID)
+ resp, _, err = TOSession.GetCDNByID(remoteCDN.ID, nil)
if err != nil {
t.Errorf("cannot GET CDN by name: '$%s', %v", firstCDN.Name, err)
}
@@ -72,7 +124,7 @@ func UpdateTestCDNs(t *testing.T) {
func GetTestCDNs(t *testing.T) {
for _, cdn := range testData.CDNs {
- resp, _, err := TOSession.GetCDNByName(cdn.Name)
+ resp, _, err := TOSession.GetCDNByName(cdn.Name, nil)
if err != nil {
t.Errorf("cannot GET CDN by name: %v - %v", err, resp)
}
@@ -83,7 +135,7 @@ func DeleteTestCDNs(t *testing.T) {
for _, cdn := range testData.CDNs {
// Retrieve the CDN by name so we can get the id for the Update
- resp, _, err := TOSession.GetCDNByName(cdn.Name)
+ resp, _, err := TOSession.GetCDNByName(cdn.Name, nil)
if err != nil {
t.Errorf("cannot GET CDN by name: %v - %v", cdn.Name, err)
}
@@ -96,7 +148,7 @@ func DeleteTestCDNs(t *testing.T) {
}
// Retrieve the CDN to see if it got deleted
- cdns, _, err := TOSession.GetCDNByName(cdn.Name)
+ cdns, _, err := TOSession.GetCDNByName(cdn.Name, nil)
if err != nil {
t.Errorf("error deleting CDN name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/cookie_test.go b/traffic_ops/testing/api/v3/cookie_test.go
index b3526d4..c193e95 100644
--- a/traffic_ops/testing/api/v3/cookie_test.go
+++ b/traffic_ops/testing/api/v3/cookie_test.go
@@ -43,7 +43,7 @@ func CookiesTest(t *testing.T) {
t.Fatal("unable to json marshal login credentials")
}
path := TestAPIBase + "/user/login"
- loginResp, _, err := s.RawRequest(http.MethodPost, path, js)
+ loginResp, _, err := s.RawRequest(http.MethodPost, path, js, nil)
if err != nil {
t.Fatal("unable to request POST /user/login")
}
@@ -54,7 +54,7 @@ func CookiesTest(t *testing.T) {
}
ensureCookie(loginResp, t)
- cdnResp, _, err := s.RawRequest(http.MethodGet, TestAPIBase+"/cdns", nil)
+ cdnResp, _, err := s.RawRequest(http.MethodGet, TestAPIBase+"/cdns", nil, nil)
if err != nil {
t.Fatal("unable to request GET /cdns")
}
diff --git a/traffic_ops/testing/api/v3/coordinates_test.go b/traffic_ops/testing/api/v3/coordinates_test.go
index e2ab1b9..fbc0a13 100644
--- a/traffic_ops/testing/api/v3/coordinates_test.go
+++ b/traffic_ops/testing/api/v3/coordinates_test.go
@@ -16,18 +16,70 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
tc "github.com/apache/trafficcontrol/lib/go-tc"
)
func TestCoordinates(t *testing.T) {
WithObjs(t, []TCObj{Parameters, Coordinates}, func() {
+ GetTestCoordinatesIMS(t)
GetTestCoordinates(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestCoordinates(t)
+ GetTestCoordinatesIMSAfterChange(t, header)
})
}
+func GetTestCoordinatesIMSAfterChange(t *testing.T, header http.Header) {
+ for _, coord := range testData.Coordinates {
+ _, reqInf, err := TOSession.GetCoordinateByName(coord.Name, header)
+ if err != nil {
+ t.Fatalf("could not GET coordinates: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, coord := range testData.Coordinates {
+ _, reqInf, err := TOSession.GetCoordinateByName(coord.Name, header)
+ if err != nil {
+ t.Fatalf("could not GET coordinates: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestCoordinatesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, coord := range testData.Coordinates {
+ _, reqInf, err := TOSession.GetCoordinateByName(coord.Name, header)
+ if err != nil {
+ t.Fatalf("No error expected, but got: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestCoordinates(t *testing.T) {
for _, coord := range testData.Coordinates {
@@ -40,7 +92,7 @@ func CreateTestCoordinates(t *testing.T) {
func GetTestCoordinates(t *testing.T) {
for _, coord := range testData.Coordinates {
- resp, _, err := TOSession.GetCoordinateByName(coord.Name)
+ resp, _, err := TOSession.GetCoordinateByName(coord.Name, nil)
if err != nil {
t.Errorf("cannot GET Coordinate: %v - %v", err, resp)
}
@@ -49,7 +101,7 @@ func GetTestCoordinates(t *testing.T) {
func UpdateTestCoordinates(t *testing.T) {
firstCoord := testData.Coordinates[0]
- resp, _, err := TOSession.GetCoordinateByName(firstCoord.Name)
+ resp, _, err := TOSession.GetCoordinateByName(firstCoord.Name, nil)
if err != nil {
t.Errorf("cannot GET Coordinate by name: %v - %v", firstCoord.Name, err)
}
@@ -64,7 +116,7 @@ func UpdateTestCoordinates(t *testing.T) {
}
// Retrieve the Coordinate to check Coordinate name got updated
- resp, _, err = TOSession.GetCoordinateByID(coord.ID)
+ resp, _, err = TOSession.GetCoordinateByID(coord.ID, nil)
if err != nil {
t.Errorf("cannot GET Coordinate by name: '$%s', %v", firstCoord.Name, err)
}
@@ -77,7 +129,7 @@ func UpdateTestCoordinates(t *testing.T) {
func DeleteTestCoordinates(t *testing.T) {
for _, coord := range testData.Coordinates {
// Retrieve the Coordinate by name so we can get the id for the Update
- resp, _, err := TOSession.GetCoordinateByName(coord.Name)
+ resp, _, err := TOSession.GetCoordinateByName(coord.Name, nil)
if err != nil {
t.Errorf("cannot GET Coordinate by name: %v - %v", coord.Name, err)
}
@@ -88,7 +140,7 @@ func DeleteTestCoordinates(t *testing.T) {
t.Errorf("cannot DELETE Coordinate by name: '%s' %v", respCoord.Name, err)
}
// Retrieve the Coordinate to see if it got deleted
- coords, _, err := TOSession.GetCoordinateByName(coord.Name)
+ coords, _, err := TOSession.GetCoordinateByName(coord.Name, nil)
if err != nil {
t.Errorf("error deleting Coordinate name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/crconfig_test.go b/traffic_ops/testing/api/v3/crconfig_test.go
index 5a88c33..11247ce 100644
--- a/traffic_ops/testing/api/v3/crconfig_test.go
+++ b/traffic_ops/testing/api/v3/crconfig_test.go
@@ -51,7 +51,7 @@ func UpdateTestCRConfigSnapshot(t *testing.T) {
}
// create an ANY_MAP DS assignment to verify that it doesn't show up in the CRConfig
- resp, _, err := TOSession.GetServers(nil)
+ resp, _, err := TOSession.GetServers(nil, nil)
if err != nil {
t.Fatalf("GetServers err expected nil, actual %+v", err)
}
@@ -66,7 +66,7 @@ func UpdateTestCRConfigSnapshot(t *testing.T) {
if serverID == 0 {
t.Errorf("GetServers expected EDGE server in cdn1, actual: %+v", servers)
}
- res, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("anymap-ds")
+ res, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("anymap-ds", nil)
if err != nil {
t.Errorf("GetDeliveryServiceByXMLIDNullable err expected nil, actual %+v", err)
}
@@ -125,7 +125,7 @@ func UpdateTestCRConfigSnapshot(t *testing.T) {
t.Errorf("GetCRConfig crc.Stats.Path expected: '"+tmURLExpected+"', actual: %+v", *crc.Stats.TMHost)
}
- paramResp, _, err := TOSession.GetParameterByName(tmURLParamName)
+ paramResp, _, err := TOSession.GetParameterByName(tmURLParamName, nil)
if err != nil {
t.Fatalf("cannot GET Parameter by name: %v - %v", tmURLParamName, err)
}
@@ -162,7 +162,7 @@ func SnapshotTestCDNbyID(t *testing.T) {
firstCDN := testData.CDNs[0]
// Retrieve the CDN by name so we can get the id for the snapshot
- resp, _, err := TOSession.GetCDNByName(firstCDN.Name)
+ resp, _, err := TOSession.GetCDNByName(firstCDN.Name, nil)
if err != nil {
t.Errorf("cannot GET CDN by name: '%s', %v", firstCDN.Name, err)
}
diff --git a/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go b/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go
index 75242db..593d523 100644
--- a/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservice_request_comments_test.go
@@ -16,24 +16,55 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
func TestDeliveryServiceRequestComments(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Parameters, Tenants, DeliveryServiceRequests, DeliveryServiceRequestComments}, func() {
+ GetTestDeliveryServiceRequestCommentsIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestDeliveryServiceRequestComments(t)
GetTestDeliveryServiceRequestComments(t)
+ GetTestDeliveryServiceRequestCommentsIMSAfterChange(t, header)
})
}
+func GetTestDeliveryServiceRequestCommentsIMSAfterChange(t *testing.T, header http.Header) {
+ _, reqInf, err := TOSession.GetDeliveryServiceRequestComments(header)
+ if err != nil {
+ t.Fatalf("could not GET delivery service request comments: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err = TOSession.GetDeliveryServiceRequestComments(header)
+ if err != nil {
+ t.Fatalf("could not GET delivery service request comments: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func CreateTestDeliveryServiceRequestComments(t *testing.T) {
// Retrieve a delivery service request by xmlId so we can get the ID needed to create a dsr comment
dsr := testData.DeliveryServiceRequests[0].DeliveryService
- resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.XMLID)
+ resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.XMLID, nil)
if err != nil {
t.Errorf("cannot GET delivery service request by xml id: %v - %v", dsr.XMLID, err)
}
@@ -55,7 +86,7 @@ func CreateTestDeliveryServiceRequestComments(t *testing.T) {
func UpdateTestDeliveryServiceRequestComments(t *testing.T) {
- comments, _, err := TOSession.GetDeliveryServiceRequestComments()
+ comments, _, err := TOSession.GetDeliveryServiceRequestComments(nil)
firstComment := comments[0]
newFirstCommentValue := "new comment value"
@@ -68,7 +99,7 @@ func UpdateTestDeliveryServiceRequestComments(t *testing.T) {
}
// Retrieve the delivery service request comment to check that the value got updated
- resp, _, err := TOSession.GetDeliveryServiceRequestCommentByID(firstComment.ID)
+ resp, _, err := TOSession.GetDeliveryServiceRequestCommentByID(firstComment.ID, nil)
if err != nil {
t.Errorf("cannot GET delivery service request comment by id: '$%d', %v", firstComment.ID, err)
}
@@ -79,12 +110,27 @@ func UpdateTestDeliveryServiceRequestComments(t *testing.T) {
}
+func GetTestDeliveryServiceRequestCommentsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetDeliveryServiceRequestComments(header)
+ if err != nil {
+ t.Fatalf("could not GET delivery service request comments: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func GetTestDeliveryServiceRequestComments(t *testing.T) {
- comments, _, _ := TOSession.GetDeliveryServiceRequestComments()
+ comments, _, _ := TOSession.GetDeliveryServiceRequestComments(nil)
for _, comment := range comments {
- resp, _, err := TOSession.GetDeliveryServiceRequestCommentByID(comment.ID)
+ resp, _, err := TOSession.GetDeliveryServiceRequestCommentByID(comment.ID, nil)
if err != nil {
t.Errorf("cannot GET delivery service request comment by id: %v - %v", err, resp)
}
@@ -93,7 +139,7 @@ func GetTestDeliveryServiceRequestComments(t *testing.T) {
func DeleteTestDeliveryServiceRequestComments(t *testing.T) {
- comments, _, _ := TOSession.GetDeliveryServiceRequestComments()
+ comments, _, _ := TOSession.GetDeliveryServiceRequestComments(nil)
for _, comment := range comments {
_, _, err := TOSession.DeleteDeliveryServiceRequestCommentByID(comment.ID)
@@ -102,7 +148,7 @@ func DeleteTestDeliveryServiceRequestComments(t *testing.T) {
}
// Retrieve the delivery service request comment to see if it got deleted
- comments, _, err := TOSession.GetDeliveryServiceRequestCommentByID(comment.ID)
+ comments, _, err := TOSession.GetDeliveryServiceRequestCommentByID(comment.ID, nil)
if err != nil {
t.Errorf("error deleting delivery service request comment: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/deliveryservice_requests_test.go b/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
index 7f510ee..e299cb6 100644
--- a/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
@@ -16,8 +16,11 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"strings"
"testing"
+ "time"
tc "github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/traffic_ops/testing/api/utils"
@@ -32,11 +35,40 @@ const (
func TestDeliveryServiceRequests(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Parameters, Tenants, DeliveryServiceRequests}, func() {
+ GetTestDeliveryServiceRequestsIMS(t)
GetTestDeliveryServiceRequests(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestDeliveryServiceRequests(t)
+ GetTestDeliveryServiceRequestsIMSAfterChange(t, header)
})
}
+func GetTestDeliveryServiceRequestsIMSAfterChange(t *testing.T, header http.Header) {
+ dsr := testData.DeliveryServiceRequests[dsrGood]
+ _, reqInf, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ _, reqInf, err = TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func CreateTestDeliveryServiceRequests(t *testing.T) {
t.Log("CreateTestDeliveryServiceRequests")
@@ -101,7 +133,7 @@ func TestDeliveryServiceRequestTypeFields(t *testing.T) {
utils.Compare(t, expected, alerts.ToStrings())
- dsrs, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
+ dsrs, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
if len(dsrs) != 1 {
t.Errorf("expected 1 deliveryservice_request with XMLID %s; got %d", dsr.DeliveryService.XMLID, len(dsrs))
}
@@ -137,7 +169,7 @@ func TestDeliveryServiceRequestBad(t *testing.T) {
func TestDeliveryServiceRequestWorkflow(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Parameters, Tenants}, func() {
// test empty request table
- dsrs, _, err := TOSession.GetDeliveryServiceRequests()
+ dsrs, _, err := TOSession.GetDeliveryServiceRequests(nil)
if err != nil {
t.Errorf("Error getting empty list of DeliveryServiceRequests %v++", err)
}
@@ -168,7 +200,7 @@ func TestDeliveryServiceRequestWorkflow(t *testing.T) {
expected = []string{`An active request exists for delivery service 'test-transitions'`}
utils.Compare(t, expected, alerts.ToStrings())
- dsrs, _, err = TOSession.GetDeliveryServiceRequestByXMLID(`test-transitions`)
+ dsrs, _, err = TOSession.GetDeliveryServiceRequestByXMLID(`test-transitions`, nil)
if len(dsrs) != 1 {
t.Errorf("Expected 1 deliveryServiceRequest -- got %d", len(dsrs))
if len(dsrs) == 0 {
@@ -199,7 +231,7 @@ func updateDeliveryServiceRequestStatus(t *testing.T, dsr tc.DeliveryServiceRequ
return alerts, dsr
}
- d, _, err := TOSession.GetDeliveryServiceRequestByID(ID)
+ d, _, err := TOSession.GetDeliveryServiceRequestByID(ID, nil)
if err != nil {
t.Errorf("Error updating deliveryservice_request %d: %v", ID, err)
return alerts, dsr
@@ -211,9 +243,25 @@ func updateDeliveryServiceRequestStatus(t *testing.T, dsr tc.DeliveryServiceRequ
return alerts, d[0]
}
+func GetTestDeliveryServiceRequestsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ dsr := testData.DeliveryServiceRequests[dsrGood]
+ _, reqInf, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func GetTestDeliveryServiceRequests(t *testing.T) {
dsr := testData.DeliveryServiceRequests[dsrGood]
- resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
+ resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
if err != nil {
t.Errorf("cannot GET DeliveryServiceRequest by XMLID: %v - %v", err, resp)
}
@@ -223,7 +271,7 @@ func UpdateTestDeliveryServiceRequests(t *testing.T) {
// Retrieve the DeliveryServiceRequest by name so we can get the id for the Update
dsr := testData.DeliveryServiceRequests[dsrGood]
- resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
+ resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
if err != nil {
t.Errorf("cannot GET DeliveryServiceRequest by name: %v - %v", dsr.DeliveryService.XMLID, err)
}
@@ -242,7 +290,7 @@ func UpdateTestDeliveryServiceRequests(t *testing.T) {
}
// Retrieve the DeliveryServiceRequest to check DeliveryServiceRequest name got updated
- resp, _, err = TOSession.GetDeliveryServiceRequestByID(respDSR.ID)
+ resp, _, err = TOSession.GetDeliveryServiceRequestByID(respDSR.ID, nil)
if err != nil {
t.Errorf("cannot GET DeliveryServiceRequest by name: %v - %v", respDSR.ID, err)
} else {
@@ -258,7 +306,7 @@ func DeleteTestDeliveryServiceRequests(t *testing.T) {
// Retrieve the DeliveryServiceRequest by name so we can get the id for the Update
dsr := testData.DeliveryServiceRequests[dsrGood]
- resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
+ resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
if err != nil {
t.Errorf("cannot GET DeliveryServiceRequest by id: %v - %v", dsr.DeliveryService.XMLID, err)
}
@@ -270,7 +318,7 @@ func DeleteTestDeliveryServiceRequests(t *testing.T) {
}
// Retrieve the DeliveryServiceRequest to see if it got deleted
- dsrs, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
+ dsrs, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID, nil)
if err != nil {
t.Errorf("error deleting DeliveryServiceRequest name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go b/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go
index d478bf6..bd61c72 100644
--- a/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservices_required_capabilities_test.go
@@ -17,9 +17,12 @@ package v3
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"net/url"
"strings"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-util"
@@ -27,11 +30,82 @@ import (
func TestDeliveryServicesRequiredCapabilities(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, ServerCapabilities, Topologies, DeliveryServices, DeliveryServicesRequiredCapabilities}, func() {
+ GetTestDeliveryServicesRequiredCapabilitiesIMS(t)
InvalidDeliveryServicesRequiredCapabilityAddition(t)
GetTestDeliveryServicesRequiredCapabilities(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
+ GetTestDeliveryServicesRequiredCapabilitiesIMSAfterChange(t, header)
})
}
+func GetTestDeliveryServicesRequiredCapabilitiesIMSAfterChange(t *testing.T, header http.Header) {
+ data := testData.DeliveryServicesRequiredCapabilities
+ ds1 := helperGetDeliveryServiceID(t, data[0].XMLID)
+
+ testCases := []struct {
+ description string
+ capability tc.DeliveryServicesRequiredCapability
+ expected int
+ }{
+ {
+ description: "get all deliveryservices required capabilities",
+ expected: len(testData.DeliveryServicesRequiredCapabilities),
+ },
+ {
+ description: fmt.Sprintf("get all deliveryservices required capabilities by deliveryServiceID: %d", *ds1),
+ capability: tc.DeliveryServicesRequiredCapability{
+ DeliveryServiceID: ds1,
+ },
+ expected: 1,
+ },
+ {
+ description: fmt.Sprintf("get all deliveryservices required capabilities by xmlID: %s", *data[0].XMLID),
+ capability: tc.DeliveryServicesRequiredCapability{
+ XMLID: data[0].XMLID,
+ },
+ expected: 1,
+ },
+ {
+ description: fmt.Sprintf("get all deliveryservices required capabilities by requiredCapability: %s", *data[0].RequiredCapability),
+ capability: tc.DeliveryServicesRequiredCapability{
+ RequiredCapability: data[0].RequiredCapability,
+ },
+ expected: 1,
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.description, func(t *testing.T) {
+ _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ })
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, tc := range testCases {
+ t.Run(tc.description, func(t *testing.T) {
+ _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ })
+ }
+}
+
func GetTestDeliveryServicesRequiredCapabilities(t *testing.T) {
data := testData.DeliveryServicesRequiredCapabilities
ds1 := helperGetDeliveryServiceID(t, data[0].XMLID)
@@ -70,7 +144,7 @@ func GetTestDeliveryServicesRequiredCapabilities(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
- capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability)
+ capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, nil)
if err != nil {
t.Fatalf("%s; got err= %v; expected err= nil", tc.description, err)
}
@@ -81,6 +155,60 @@ func GetTestDeliveryServicesRequiredCapabilities(t *testing.T) {
}
}
+func GetTestDeliveryServicesRequiredCapabilitiesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ data := testData.DeliveryServicesRequiredCapabilities
+ ds1 := helperGetDeliveryServiceID(t, data[0].XMLID)
+
+ testCases := []struct {
+ description string
+ capability tc.DeliveryServicesRequiredCapability
+ expected int
+ }{
+ {
+ description: "get all deliveryservices required capabilities",
+ expected: len(testData.DeliveryServicesRequiredCapabilities),
+ },
+ {
+ description: fmt.Sprintf("get all deliveryservices required capabilities by deliveryServiceID: %d", *ds1),
+ capability: tc.DeliveryServicesRequiredCapability{
+ DeliveryServiceID: ds1,
+ },
+ expected: 1,
+ },
+ {
+ description: fmt.Sprintf("get all deliveryservices required capabilities by xmlID: %s", *data[0].XMLID),
+ capability: tc.DeliveryServicesRequiredCapability{
+ XMLID: data[0].XMLID,
+ },
+ expected: 1,
+ },
+ {
+ description: fmt.Sprintf("get all deliveryservices required capabilities by requiredCapability: %s", *data[0].RequiredCapability),
+ capability: tc.DeliveryServicesRequiredCapability{
+ RequiredCapability: data[0].RequiredCapability,
+ },
+ expected: 1,
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.description, func(t *testing.T) {
+ _, reqInf, err := TOSession.GetDeliveryServicesRequiredCapabilities(tc.capability.DeliveryServiceID, tc.capability.XMLID, tc.capability.RequiredCapability, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ })
+ }
+}
+
func CreateTestDeliveryServicesRequiredCapabilities(t *testing.T) {
data := testData.DeliveryServicesRequiredCapabilities
if len(data) == 0 {
@@ -173,7 +301,7 @@ func InvalidDeliveryServicesRequiredCapabilityAddition(t *testing.T) {
// Tests that a capability cannot be made required if the DS's services do not have it assigned
// Get Delivery Capability for a DS
- capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, util.StrPtr("ds1"), nil)
+ capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, util.StrPtr("ds1"), nil, nil)
if err != nil {
t.Fatalf("cannot GET delivery service required capabilities: %v", err)
}
@@ -185,7 +313,7 @@ func InvalidDeliveryServicesRequiredCapabilityAddition(t *testing.T) {
// TODO: DON'T hard-code hostnames!
params := url.Values{}
params.Add("hostName", "atlanta-edge-01")
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("cannot GET Server by hostname: %v", err)
}
@@ -261,7 +389,7 @@ func InvalidDeliveryServicesRequiredCapabilityAddition(t *testing.T) {
func DeleteTestDeliveryServicesRequiredCapabilities(t *testing.T) {
// Get Required Capabilities to delete them
- capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, nil, nil)
+ capabilities, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, nil, nil, nil)
if err != nil {
t.Fatalf(err.Error())
}
@@ -317,7 +445,7 @@ func helperGetDeliveryServiceID(t *testing.T, xmlID *string) *int {
if xmlID == nil {
t.Fatal("xml id must not be nil")
}
- ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*xmlID)
+ ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*xmlID, nil)
if err != nil {
t.Fatal(err)
}
diff --git a/traffic_ops/testing/api/v3/deliveryservices_test.go b/traffic_ops/testing/api/v3/deliveryservices_test.go
index 6737b1e..2c0e4ab 100644
--- a/traffic_ops/testing/api/v3/deliveryservices_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservices_test.go
@@ -19,6 +19,8 @@ import (
"encoding/json"
"errors"
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"reflect"
"strconv"
"testing"
@@ -31,12 +33,19 @@ import (
func TestDeliveryServices(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies, DeliveryServices}, func() {
+ GetTestDeliveryServicesIMS(t)
GetAccessibleToTest(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestDeliveryServices(t)
UpdateNullableTestDeliveryServices(t)
UpdateDeliveryServiceWithInvalidRemapText(t)
UpdateDeliveryServiceWithInvalidSliceRangeRequest(t)
UpdateDeliveryServiceWithInvalidTopology(t)
+ GetTestDeliveryServicesIMSAfterChange(t, header)
UpdateDeliveryServiceTopologyHeaderRewriteFields(t)
GetTestDeliveryServices(t)
DeliveryServiceMinorVersionsTest(t)
@@ -45,6 +54,27 @@ func TestDeliveryServices(t *testing.T) {
})
}
+func GetTestDeliveryServicesIMSAfterChange(t *testing.T, header http.Header) {
+ _, reqInf, err := TOSession.GetDeliveryServicesNullable(header)
+ if err != nil {
+ t.Fatalf("could not GET Delivery Services: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ _, reqInf, err = TOSession.GetDeliveryServicesNullable(header)
+ if err != nil {
+ t.Fatalf("could not GET Delivery Services: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func PostDeliveryServiceTest(t *testing.T) {
ds := testData.DeliveryServices[0]
ds.XMLID = util.StrPtr("")
@@ -77,8 +107,23 @@ func CreateTestDeliveryServices(t *testing.T) {
}
}
+func GetTestDeliveryServicesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetDeliveryServicesNullable(header)
+ if err != nil {
+ t.Fatalf("could not GET Delivery Services: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func GetTestDeliveryServices(t *testing.T) {
- actualDSes, _, err := TOSession.GetDeliveryServicesNullable()
+ actualDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Errorf("cannot GET DeliveryServices: %v - %v", err, actualDSes)
}
@@ -107,7 +152,7 @@ func GetTestDeliveryServices(t *testing.T) {
func UpdateTestDeliveryServices(t *testing.T) {
firstDS := testData.DeliveryServices[0]
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Errorf("cannot GET Delivery Services: %v", err)
}
@@ -138,7 +183,7 @@ func UpdateTestDeliveryServices(t *testing.T) {
}
// Retrieve the server to check rack and interfaceName values were updated
- resp, _, err := TOSession.GetDeliveryServiceNullable(strconv.Itoa(*remoteDS.ID))
+ resp, _, err := TOSession.GetDeliveryServiceNullable(strconv.Itoa(*remoteDS.ID), nil)
if err != nil {
t.Errorf("cannot GET Delivery Service by ID: %v - %v", remoteDS.XMLID, err)
}
@@ -156,7 +201,7 @@ func UpdateTestDeliveryServices(t *testing.T) {
func UpdateNullableTestDeliveryServices(t *testing.T) {
firstDS := testData.DeliveryServices[0]
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -187,7 +232,7 @@ func UpdateNullableTestDeliveryServices(t *testing.T) {
}
// Retrieve the server to check rack and interfaceName values were updated
- resp, _, err := TOSession.GetDeliveryServiceNullable(strconv.Itoa(*remoteDS.ID))
+ resp, _, err := TOSession.GetDeliveryServiceNullable(strconv.Itoa(*remoteDS.ID), nil)
if err != nil {
t.Fatalf("cannot GET Delivery Service by ID: %v - %v", remoteDS.XMLID, err)
}
@@ -208,7 +253,7 @@ func UpdateNullableTestDeliveryServices(t *testing.T) {
// UpdateDeliveryServiceWithInvalidTopology ensures that a topology cannot be assigned to (CLIENT_)STEERING delivery services.
func UpdateDeliveryServiceWithInvalidTopology(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -231,7 +276,7 @@ func UpdateDeliveryServiceWithInvalidTopology(t *testing.T) {
// UpdateDeliveryServiceTopologyHeaderRewriteFields ensures that a delivery service can only use firstHeaderRewrite,
// innerHeaderRewrite, or lastHeadeRewrite if a topology is assigned.
func UpdateDeliveryServiceTopologyHeaderRewriteFields(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -272,7 +317,7 @@ func UpdateDeliveryServiceTopologyHeaderRewriteFields(t *testing.T) {
func UpdateDeliveryServiceWithInvalidRemapText(t *testing.T) {
firstDS := testData.DeliveryServices[0]
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -315,7 +360,7 @@ func UpdateDeliveryServiceWithInvalidSliceRangeRequest(t *testing.T) {
t.Fatal("no HTTP or DNS Delivery Services to test with")
}
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v", err)
}
@@ -404,7 +449,7 @@ func GetAccessibleToTest(t *testing.T) {
}
//First and only child tenant, no access to root
- childTenant, _, err := TOSession.TenantByName("tenant1")
+ childTenant, _, err := TOSession.TenantByName("tenant1", nil)
if err != nil {
t.Fatal("unable to get tenant " + err.Error())
}
@@ -431,7 +476,7 @@ func getByTenants(tenantID int, expectedCount int) error {
}
func DeleteTestDeliveryServices(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Errorf("cannot GET deliveryservices: %v", err)
}
@@ -455,14 +500,14 @@ func DeleteTestDeliveryServices(t *testing.T) {
}
// Retrieve the Server to see if it got deleted
- foundDS, _, err := TOSession.GetDeliveryServiceNullable(strconv.Itoa(*ds.ID))
+ foundDS, _, err := TOSession.GetDeliveryServiceNullable(strconv.Itoa(*ds.ID), nil)
if err == nil && foundDS != nil {
t.Errorf("expected Delivery Service: %s to be deleted", *ds.XMLID)
}
}
// clean up parameter created in CreateTestDeliveryServices()
- params, _, err := TOSession.GetParameterByNameAndConfigFile("location", "remap.config")
+ params, _, err := TOSession.GetParameterByNameAndConfigFile("location", "remap.config", nil)
for _, param := range params {
deleted, _, err := TOSession.DeleteParameterByID(param.ID)
if err != nil {
@@ -477,7 +522,7 @@ func DeliveryServiceMinorVersionsTest(t *testing.T) {
t.Errorf("expected XMLID: ds-test-minor-versions, actual: %s", *testDS.XMLID)
}
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Errorf("cannot GET DeliveryServices: %v - %v", err, dses)
}
@@ -544,7 +589,7 @@ func DeliveryServiceMinorVersionsTest(t *testing.T) {
}
func DeliveryServiceTenancyTest(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Errorf("cannot GET deliveryservices: %v", err)
}
@@ -566,7 +611,7 @@ func DeliveryServiceTenancyTest(t *testing.T) {
t.Fatalf("failed to log in with tenant4user: %v", err.Error())
}
- dsesReadableByTenant4, _, err := tenant4TOClient.GetDeliveryServicesNullable()
+ dsesReadableByTenant4, _, err := tenant4TOClient.GetDeliveryServicesNullable(nil)
if err != nil {
t.Error("tenant4user cannot GET deliveryservices")
}
diff --git a/traffic_ops/testing/api/v3/deliveryserviceservers_test.go b/traffic_ops/testing/api/v3/deliveryserviceservers_test.go
index e56bd0e..55f3d10 100644
--- a/traffic_ops/testing/api/v3/deliveryserviceservers_test.go
+++ b/traffic_ops/testing/api/v3/deliveryserviceservers_test.go
@@ -41,7 +41,7 @@ func TestDeliveryServiceServersWithRequiredCapabilities(t *testing.T) {
}
func AssignServersToTopologyBasedDeliveryService(t *testing.T) {
- ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds-top")
+ ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds-top", nil)
if err != nil {
t.Fatalf("cannot GET delivery service 'ds-top': %s", err.Error())
}
@@ -51,7 +51,7 @@ func AssignServersToTopologyBasedDeliveryService(t *testing.T) {
if ds[0].Topology == nil {
t.Fatal("expected delivery service: 'ds-top' to have a non-nil Topology, actual: nil")
}
- serversResp, _, err := TOSession.GetServers(nil)
+ serversResp, _, err := TOSession.GetServers(nil, nil)
servers := []tc.ServerNullable{}
for _, s := range serversResp.Response {
if s.CDNID != nil && *s.CDNID == *ds[0].CDNID && s.Type == tc.CacheTypeEdge.String() {
@@ -123,7 +123,7 @@ func CreateTestDeliveryServiceServersWithRequiredCapabilities(t *testing.T) {
t.Run(ctc.description, func(t *testing.T) {
params := url.Values{}
params.Add("hostName", ctc.serverName)
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("cannot GET Server by hostname: %v", err)
}
@@ -158,7 +158,7 @@ func CreateTestDeliveryServiceServersWithRequiredCapabilities(t *testing.T) {
}
func CreateTestMSODSServerWithReqCap(t *testing.T) {
- dsReqCap, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, util.StrPtr("msods1"), nil)
+ dsReqCap, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, util.StrPtr("msods1"), nil, nil)
if err != nil {
t.Fatalf("GET delivery service required capabilites: %v", err)
}
@@ -171,7 +171,7 @@ func CreateTestMSODSServerWithReqCap(t *testing.T) {
// TODO: DON'T hard-code server hostnames!
params := url.Values{}
params.Add("hostName", "denver-mso-org-01")
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("GET server denver-mso-org-01: %v", err)
}
@@ -186,7 +186,7 @@ func CreateTestMSODSServerWithReqCap(t *testing.T) {
}
// Make sure server has no caps to ensure test correctness
- sccs, _, err := TOSession.GetServerServerCapabilities(s.ID, nil, nil)
+ sccs, _, err := TOSession.GetServerServerCapabilities(s.ID, nil, nil, nil)
if err != nil {
t.Fatalf("GET server server capabilities for denver-mso-org-01: %v", err)
}
@@ -195,7 +195,7 @@ func CreateTestMSODSServerWithReqCap(t *testing.T) {
}
// Is origin included in eligible servers even though it doesnt have required capability
- eServers, _, err := TOSession.GetDeliveryServicesEligible(*dsReqCap[0].DeliveryServiceID)
+ eServers, _, err := TOSession.GetDeliveryServicesEligible(*dsReqCap[0].DeliveryServiceID, nil)
if err != nil {
t.Fatalf("GET delivery service msods1 eligible servers: %v", err)
}
@@ -290,7 +290,7 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
}
func getServerAndDSofSameCDN(t *testing.T) (tc.DeliveryServiceNullable, tc.ServerNullable) {
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v", err)
}
@@ -298,7 +298,7 @@ func getServerAndDSofSameCDN(t *testing.T) (tc.DeliveryServiceNullable, tc.Serve
t.Fatal("GET DeliveryServices returned no dses, must have at least 1 to test ds-servers")
}
- resp, _, err := TOSession.GetServers(nil)
+ resp, _, err := TOSession.GetServers(nil, nil)
if err != nil {
t.Fatalf("cannot GET Servers: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go b/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go
index b0ddb95..de6c6af 100644
--- a/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservicesideligible_test.go
@@ -16,17 +16,36 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
)
func TestDeliveryServicesEligible(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies, DeliveryServices}, func() {
+ GetTestDeliveryServicesEligibleIMS(t)
GetTestDeliveryServicesEligible(t)
})
}
+func GetTestDeliveryServicesEligibleIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetDeliveryServicesNullable(header)
+ if err != nil {
+ t.Fatalf("could not GET eligible delivery services: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func GetTestDeliveryServicesEligible(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Errorf("cannot GET DeliveryServices: %v", err)
}
@@ -34,7 +53,7 @@ func GetTestDeliveryServicesEligible(t *testing.T) {
t.Error("GET DeliveryServices returned no delivery services, need at least 1 to test")
}
dsID := dses[0].ID
- servers, _, err := TOSession.GetDeliveryServicesEligible(*dsID)
+ servers, _, err := TOSession.GetDeliveryServicesEligible(*dsID, nil)
if err != nil {
t.Errorf("getting delivery services eligible: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go b/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go
index 8ed520c..4badc0e 100644
--- a/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservicesregexes_test.go
@@ -17,8 +17,11 @@ package v3
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"strconv"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -26,6 +29,7 @@ import (
func TestDeliveryServicesRegexes(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies, DeliveryServices, DeliveryServicesRegexes}, func() {
QueryDSRegexTest(t)
+ QueryDSRegexTestIMS(t)
})
}
@@ -94,7 +98,7 @@ func DeleteTestDeliveryServicesRegexes(t *testing.T) {
}
func loadDSRegexIDs(t *testing.T, test *tc.DeliveryServiceRegexesTest) {
- dsTypes, _, err := TOSession.GetTypeByName(test.TypeName)
+ dsTypes, _, err := TOSession.GetTypeByName(test.TypeName, nil)
if err != nil {
t.Fatalf("unable to get type by name %v: %v", test.TypeName, err)
}
@@ -103,7 +107,7 @@ func loadDSRegexIDs(t *testing.T, test *tc.DeliveryServiceRegexesTest) {
}
test.Type = dsTypes[0].ID
- dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(test.DSName)
+ dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(test.DSName, nil)
if err != nil {
t.Fatalf("unable to ds by xmlid %v: %v", test.DSName, err)
}
@@ -113,8 +117,23 @@ func loadDSRegexIDs(t *testing.T, test *tc.DeliveryServiceRegexesTest) {
test.DSID = *dses[0].ID
}
+func QueryDSRegexTestIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds1", header)
+ if err != nil {
+ t.Fatalf("could not GET delivery services regex: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func QueryDSRegexTest(t *testing.T) {
- ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds1")
+ ds, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds1", nil)
if err != nil {
t.Fatalf("unable to get ds ds1: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/divisions_test.go b/traffic_ops/testing/api/v3/divisions_test.go
index e15f928..daaf5f1 100644
--- a/traffic_ops/testing/api/v3/divisions_test.go
+++ b/traffic_ops/testing/api/v3/divisions_test.go
@@ -16,24 +16,76 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"strings"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
func TestDivisions(t *testing.T) {
WithObjs(t, []TCObj{Parameters, Divisions, Regions}, func() {
+ GetTestDivisionsIMS(t)
TryToDeleteDivision(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestDivisions(t)
+ GetTestDivisionsIMSAfterChange(t, header)
GetTestDivisions(t)
})
}
+func GetTestDivisionsIMSAfterChange(t *testing.T, header http.Header) {
+ for _, division := range testData.Divisions {
+ _, reqInf, err := TOSession.GetDivisionByName(division.Name, header)
+ if err != nil {
+ t.Fatalf("could not GET divisions: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, division := range testData.Divisions {
+ _, reqInf, err := TOSession.GetDivisionByName(division.Name, header)
+ if err != nil {
+ t.Fatalf("could not GET divisions: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestDivisionsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, division := range testData.Divisions {
+ _, reqInf, err := TOSession.GetDivisionByName(division.Name, header)
+ if err != nil {
+ t.Fatalf("could not GET divisions: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func TryToDeleteDivision(t *testing.T) {
division := testData.Divisions[0]
- resp, _, err := TOSession.GetDivisionByName(division.Name)
+ resp, _, err := TOSession.GetDivisionByName(division.Name, nil)
if err != nil {
t.Errorf("cannot GET Division by name: %v - %v", division.Name, err)
}
@@ -71,7 +123,7 @@ func UpdateTestDivisions(t *testing.T) {
firstDivision := testData.Divisions[0]
// Retrieve the Division by division so we can get the id for the Update
- resp, _, err := TOSession.GetDivisionByName(firstDivision.Name)
+ resp, _, err := TOSession.GetDivisionByName(firstDivision.Name, nil)
if err != nil {
t.Errorf("cannot GET Division by division: %v - %v", firstDivision.Name, err)
}
@@ -85,7 +137,7 @@ func UpdateTestDivisions(t *testing.T) {
}
// Retrieve the Division to check division got updated
- resp, _, err = TOSession.GetDivisionByID(remoteDivision.ID)
+ resp, _, err = TOSession.GetDivisionByID(remoteDivision.ID, nil)
if err != nil {
t.Errorf("cannot GET Division by division: %v - %v", firstDivision.Name, err)
}
@@ -105,7 +157,7 @@ func UpdateTestDivisions(t *testing.T) {
func GetTestDivisions(t *testing.T) {
for _, division := range testData.Divisions {
- resp, _, err := TOSession.GetDivisionByName(division.Name)
+ resp, _, err := TOSession.GetDivisionByName(division.Name, nil)
if err != nil {
t.Errorf("cannot GET Division by division: %v - %v", err, resp)
}
@@ -116,7 +168,7 @@ func DeleteTestDivisions(t *testing.T) {
for _, division := range testData.Divisions {
// Retrieve the Division by name so we can get the id
- resp, _, err := TOSession.GetDivisionByName(division.Name)
+ resp, _, err := TOSession.GetDivisionByName(division.Name, nil)
if err != nil {
t.Errorf("cannot GET Division by name: %v - %v", division.Name, err)
}
@@ -128,7 +180,7 @@ func DeleteTestDivisions(t *testing.T) {
}
// Retrieve the Division to see if it got deleted
- divisionResp, _, err := TOSession.GetDivisionByName(division.Name)
+ divisionResp, _, err := TOSession.GetDivisionByName(division.Name, nil)
if err != nil {
t.Errorf("error deleting Division division: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/federation_resolvers_test.go b/traffic_ops/testing/api/v3/federation_resolvers_test.go
index c071aa0..cfd9ff7 100644
--- a/traffic_ops/testing/api/v3/federation_resolvers_test.go
+++ b/traffic_ops/testing/api/v3/federation_resolvers_test.go
@@ -16,17 +16,38 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
-
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-util"
)
func TestFederationResolvers(t *testing.T) {
WithObjs(t, []TCObj{Types, FederationResolvers}, func() {
+ GetTestFederationResolversIMS(t)
GetTestFederationResolvers(t)
})
}
+func GetTestFederationResolversIMS(t *testing.T) {
+ var tdlen = len(testData.FederationResolvers)
+ if tdlen < 1 {
+ t.Fatal("no federation resolvers test data")
+ }
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetFederationResolvers(header)
+ if err != nil {
+ t.Fatalf("could not GET Federation resolvers: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
func GetTestFederationResolvers(t *testing.T) {
var tdlen = len(testData.FederationResolvers)
@@ -34,7 +55,7 @@ func GetTestFederationResolvers(t *testing.T) {
t.Fatal("no federation resolvers test data")
}
- frs, _, err := TOSession.GetFederationResolvers()
+ frs, _, err := TOSession.GetFederationResolvers(nil)
if err != nil {
t.Errorf("Unexpected error getting Federation Resolvers: %v", err)
}
@@ -54,7 +75,7 @@ func GetTestFederationResolvers(t *testing.T) {
func getFRByIDTest(testFr tc.FederationResolver) func(*testing.T) {
return func(t *testing.T) {
- fr, _, err := TOSession.GetFederationResolverByID(*testFr.ID)
+ fr, _, err := TOSession.GetFederationResolverByID(*testFr.ID, nil)
if err != nil {
t.Fatalf("Unexpected error getting Federation Resolver by ID %d: %v", *testFr.ID, err)
}
@@ -66,7 +87,7 @@ func getFRByIDTest(testFr tc.FederationResolver) func(*testing.T) {
func getFRByIPTest(testFr tc.FederationResolver) func(*testing.T) {
return func(t *testing.T) {
- fr, _, err := TOSession.GetFederationResolverByIPAddress(*testFr.IPAddress)
+ fr, _, err := TOSession.GetFederationResolverByIPAddress(*testFr.IPAddress, nil)
if err != nil {
t.Fatalf("Unexpected error getting Federation Resolver by IP %s: %v", *testFr.IPAddress, err)
}
@@ -78,7 +99,7 @@ func getFRByIPTest(testFr tc.FederationResolver) func(*testing.T) {
func getFRByTypeTest(testFr tc.FederationResolver) func(*testing.T) {
return func(t *testing.T) {
- frs, _, err := TOSession.GetFederationResolversByType(*testFr.Type)
+ frs, _, err := TOSession.GetFederationResolversByType(*testFr.Type, nil)
if err != nil {
t.Fatalf("Unexpected error getting Federation Resolvers by Type %s: %v", *testFr.Type, err)
}
@@ -129,7 +150,7 @@ func CreateTestFederationResolvers(t *testing.T) {
t.Fatal("testData Federation Resolver has nil Type")
}
- tid, _, err := TOSession.GetTypeByName(*fr.Type)
+ tid, _, err := TOSession.GetTypeByName(*fr.Type, nil)
if err != nil {
t.Fatalf("Couldn't get an ID for type %s", *fr.Type)
}
@@ -181,7 +202,7 @@ func CreateTestFederationResolvers(t *testing.T) {
}
func DeleteTestFederationResolvers(t *testing.T) {
- frs, _, err := TOSession.GetFederationResolvers()
+ frs, _, err := TOSession.GetFederationResolvers(nil)
if err != nil {
t.Errorf("Unexpected error getting Federation Resolvers: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/federation_users_test.go b/traffic_ops/testing/api/v3/federation_users_test.go
index ba2f38b..24e0c0d 100644
--- a/traffic_ops/testing/api/v3/federation_users_test.go
+++ b/traffic_ops/testing/api/v3/federation_users_test.go
@@ -16,16 +16,47 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
)
func TestFederationUsers(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Topologies, DeliveryServices, CDNFederations, FederationUsers}, func() {
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
CreateTestInvalidFederationUsers(t)
GetTestInvalidFederationIDUsers(t)
+ CreateTestValidFederationUsers(t)
+ GetTestValidFederationIDUsersIMSAfterChange(t, header)
})
}
+func GetTestValidFederationIDUsersIMSAfterChange(t *testing.T, header http.Header) {
+ _, reqInf, err := TOSession.GetFederationUsers(fedIDs[0], header)
+ if err != nil {
+ t.Fatalf("No error expected, but got: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ _, reqInf, err = TOSession.GetFederationUsers(fedIDs[0], header)
+ if err != nil {
+ t.Fatalf("No error expected, but got: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func CreateTestFederationUsers(t *testing.T) {
if len(testData.Federations) == 0 {
t.Error("no federations test data")
@@ -34,7 +65,7 @@ func CreateTestFederationUsers(t *testing.T) {
fedID := fedIDs[0]
// Get Users
- users, _, err := TOSession.GetUsers()
+ users, _, err := TOSession.GetUsers(nil)
if err != nil {
t.Fatalf("getting users: " + err.Error())
}
@@ -52,7 +83,7 @@ func CreateTestFederationUsers(t *testing.T) {
t.Fatalf("assigning users %v to federation %v: %v", []int{*u1}, fedID, err.Error())
}
- fedUsers, _, err := TOSession.GetFederationUsers(fedID)
+ fedUsers, _, err := TOSession.GetFederationUsers(fedID, nil)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
@@ -66,7 +97,7 @@ func CreateTestFederationUsers(t *testing.T) {
t.Fatalf("assigning users %v to federation %v: %v", []int{*u2, *u3}, fedID, err.Error())
}
- fedUsers, _, err = TOSession.GetFederationUsers(fedID)
+ fedUsers, _, err = TOSession.GetFederationUsers(fedID, nil)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
@@ -80,7 +111,7 @@ func CreateTestFederationUsers(t *testing.T) {
t.Fatalf("assigning users %v to federation %v: %v", []int{*u1}, fedID, err.Error())
}
- fedUsers, _, err = TOSession.GetFederationUsers(fedID)
+ fedUsers, _, err = TOSession.GetFederationUsers(fedID, nil)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
@@ -90,12 +121,34 @@ func CreateTestFederationUsers(t *testing.T) {
}
func GetTestInvalidFederationIDUsers(t *testing.T) {
- _, _, err := TOSession.GetFederationUsers(-1)
+ _, _, err := TOSession.GetFederationUsers(-1, nil)
if err == nil {
t.Fatalf("expected to get an error when requesting federation users for a non-existent federation")
}
}
+func CreateTestValidFederationUsers(t *testing.T) {
+ if len(testData.Federations) == 0 {
+ t.Error("no federations test data")
+ }
+
+ fedID := fedIDs[0]
+
+ // Get Users
+ users, _, err := TOSession.GetUsers(nil)
+ if err != nil {
+ t.Fatalf("getting users: " + err.Error())
+ }
+ if len(users) == 0 {
+ t.Fatal("need at least 1 user to test invalid federation user create")
+ }
+
+ // Associate with invalid federdation id
+ _, _, err = TOSession.CreateFederationUsers(fedID, []int{*users[0].ID}, false)
+ if err == nil {
+ t.Error("expected to get error back from associating non existent federation id")
+ }
+}
func CreateTestInvalidFederationUsers(t *testing.T) {
if len(testData.Federations) == 0 {
t.Error("no federations test data")
@@ -104,7 +157,7 @@ func CreateTestInvalidFederationUsers(t *testing.T) {
fedID := fedIDs[0]
// Get Users
- users, _, err := TOSession.GetUsers()
+ users, _, err := TOSession.GetUsers(nil)
if err != nil {
t.Fatalf("getting users: " + err.Error())
}
@@ -132,7 +185,7 @@ func DeleteTestFederationUsers(t *testing.T) {
fedID := fedIDs[0]
- fedUsers, _, err := TOSession.GetFederationUsers(fedID)
+ fedUsers, _, err := TOSession.GetFederationUsers(fedID, nil)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
@@ -147,7 +200,7 @@ func DeleteTestFederationUsers(t *testing.T) {
}
}
- fedUsers, _, err = TOSession.GetFederationUsers(fedID)
+ fedUsers, _, err = TOSession.GetFederationUsers(fedID, nil)
if err != nil {
t.Fatalf("gettings users for federation %v: %v", fedID, err.Error())
}
diff --git a/traffic_ops/testing/api/v3/federations_test.go b/traffic_ops/testing/api/v3/federations_test.go
index 910e770..394bf54 100644
--- a/traffic_ops/testing/api/v3/federations_test.go
+++ b/traffic_ops/testing/api/v3/federations_test.go
@@ -18,7 +18,10 @@ package v3
import (
"errors"
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -27,17 +30,37 @@ func TestFederations(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Topologies, DeliveryServices, CDNFederations}, func() {
PostDeleteTestFederationsDeliveryServices(t)
GetTestFederations(t)
+ GetTestFederationsIMS(t)
AddFederationResolversForCurrentUserTest(t)
RemoveFederationResolversForCurrentUserTest(t)
})
}
+func GetTestFederationsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ if len(testData.Federations) == 0 {
+ t.Error("no federations test data")
+ }
+
+ _, reqInf, err := TOSession.AllFederations(header)
+ if err != nil {
+ t.Fatalf("No error expected, but got: %v", err)
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func GetTestFederations(t *testing.T) {
if len(testData.Federations) == 0 {
t.Error("no federations test data")
}
- feds, _, err := TOSession.AllFederations()
+ feds, _, err := TOSession.AllFederations(nil)
if err != nil {
t.Errorf("getting federations: " + err.Error())
}
@@ -83,7 +106,7 @@ func GetTestFederations(t *testing.T) {
}
func createFederationToDeliveryServiceAssociation() (int, tc.DeliveryServiceNullable, tc.DeliveryServiceNullable, error) {
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
return -1, tc.DeliveryServiceNullable{}, tc.DeliveryServiceNullable{}, fmt.Errorf("cannot GET DeliveryServices: %v - %v", err, dses)
}
@@ -114,7 +137,7 @@ func PostDeleteTestFederationsDeliveryServices(t *testing.T) {
}
// Test get created Federation Delivery Services
- fedDSes, _, err := TOSession.GetFederationDeliveryServices(fedID)
+ fedDSes, _, err := TOSession.GetFederationDeliveryServices(fedID, nil)
if err != nil {
t.Fatalf("cannot GET Federation DeliveryServices: %v", err)
}
@@ -131,7 +154,7 @@ func PostDeleteTestFederationsDeliveryServices(t *testing.T) {
// Make sure it is deleted
// Test get created Federation Delivery Services
- fedDSes, _, err = TOSession.GetFederationDeliveryServices(fedID)
+ fedDSes, _, err = TOSession.GetFederationDeliveryServices(fedID, nil)
if err != nil {
t.Fatalf("cannot GET Federation DeliveryServices: %v", err)
}
@@ -179,7 +202,7 @@ func AddFederationResolversForCurrentUserTest(t *testing.T) {
}
// need to assign myself the federation to set its mappings
- me, _, err := TOSession.GetUserCurrent()
+ me, _, err := TOSession.GetUserCurrent(nil)
if err != nil {
t.Fatalf("Couldn't figure out who I am: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/iso_test.go b/traffic_ops/testing/api/v3/iso_test.go
index 539dd9d..d450b1b 100644
--- a/traffic_ops/testing/api/v3/iso_test.go
+++ b/traffic_ops/testing/api/v3/iso_test.go
@@ -78,7 +78,7 @@ func TestGetOSVersions(t *testing.T) {
}
// Cleanup DB entry
defer func() {
- resp, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(p.Name, p.ConfigFile, p.Value)
+ resp, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(p.Name, p.ConfigFile, p.Value, nil)
if err != nil {
t.Fatalf("cannot GET Parameter by name: %v - %v\n", p.Name, err)
}
diff --git a/traffic_ops/testing/api/v3/jobs_test.go b/traffic_ops/testing/api/v3/jobs_test.go
index bb5d983..f1b8585 100644
--- a/traffic_ops/testing/api/v3/jobs_test.go
+++ b/traffic_ops/testing/api/v3/jobs_test.go
@@ -37,7 +37,7 @@ func TestJobs(t *testing.T) {
}
func CreateTestJobs(t *testing.T) {
- toDSes, _, err := TOSession.GetDeliveryServicesNullable()
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v - %v", err, toDSes)
}
@@ -65,7 +65,7 @@ func CreateTestJobs(t *testing.T) {
}
func CreateTestInvalidationJobs(t *testing.T) {
- toDSes, _, err := TOSession.GetDeliveryServicesNullable()
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v - %v", err, toDSes)
}
@@ -86,7 +86,7 @@ func CreateTestInvalidationJobs(t *testing.T) {
}
func CreateTestInvalidJob(t *testing.T) {
- toDSes, _, err := TOSession.GetDeliveryServicesNullable()
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET Delivery Services: %v - %v", err, toDSes)
}
@@ -153,7 +153,7 @@ func GetTestJobs(t *testing.T) {
t.Fatalf("error getting jobs: %v", err)
}
- toDSes, _, err := TOSession.GetDeliveryServicesNullable()
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v - %v", err, toDSes)
}
@@ -202,7 +202,7 @@ func GetTestInvalidationJobs(t *testing.T) {
t.Fatalf("error getting invalidation jobs: %v", err)
}
- toDSes, _, err := TOSession.GetDeliveryServicesNullable()
+ toDSes, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v - %v", err, toDSes)
}
diff --git a/traffic_ops/testing/api/v3/loginfail_test.go b/traffic_ops/testing/api/v3/loginfail_test.go
index 52ef0a5..db65180 100644
--- a/traffic_ops/testing/api/v3/loginfail_test.go
+++ b/traffic_ops/testing/api/v3/loginfail_test.go
@@ -50,7 +50,7 @@ func PostTestLoginFail(t *testing.T) {
t.Fatal("cannot test login: must have at least 1 test data cdn")
}
expectedCDN := testData.CDNs[0]
- actualCDNs, _, err := uninitializedTOClient.GetCDNByName(expectedCDN.Name)
+ actualCDNs, _, err := uninitializedTOClient.GetCDNByName(expectedCDN.Name, nil)
if err != nil {
t.Fatalf("GetCDNByName err expected nil, actual '%+v'", err)
}
diff --git a/traffic_ops/testing/api/v3/parameters_test.go b/traffic_ops/testing/api/v3/parameters_test.go
index c1de71c..7f38880 100644
--- a/traffic_ops/testing/api/v3/parameters_test.go
+++ b/traffic_ops/testing/api/v3/parameters_test.go
@@ -16,8 +16,11 @@
package v3
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"sync"
"testing"
+ "time"
tc "github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -28,11 +31,43 @@ func TestParameters(t *testing.T) {
//SwitchSession(toReqTimeout, Config.TrafficOps.URL, Config.TrafficOps.Users.Admin, Config.TrafficOps.UserPassword, Config.TrafficOps.Users.Portal, Config.TrafficOps.UserPassword)
WithObjs(t, []TCObj{Parameters}, func() {
+ GetTestParametersIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestParameters(t)
GetTestParameters(t)
+ GetTestParametersIMSAfterChange(t, header)
})
}
+func GetTestParametersIMSAfterChange(t *testing.T, header http.Header) {
+ for _, pl := range testData.Parameters {
+ _, reqInf, err := TOSession.GetParameterByName(pl.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, pl := range testData.Parameters {
+ _, reqInf, err := TOSession.GetParameterByName(pl.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestParameters(t *testing.T) {
for _, pl := range testData.Parameters {
@@ -49,7 +84,7 @@ func UpdateTestParameters(t *testing.T) {
firstParameter := testData.Parameters[0]
// Retrieve the Parameter by name so we can get the id for the Update
- resp, _, err := TOSession.GetParameterByName(firstParameter.Name)
+ resp, _, err := TOSession.GetParameterByName(firstParameter.Name, nil)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", firstParameter.Name, err)
}
@@ -63,7 +98,7 @@ func UpdateTestParameters(t *testing.T) {
}
// Retrieve the Parameter to check Parameter name got updated
- resp, _, err = TOSession.GetParameterByID(remoteParameter.ID)
+ resp, _, err = TOSession.GetParameterByID(remoteParameter.ID, nil)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", firstParameter.Name, err)
}
@@ -74,10 +109,27 @@ func UpdateTestParameters(t *testing.T) {
}
+func GetTestParametersIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, pl := range testData.Parameters {
+ _, reqInf, err := TOSession.GetParameterByName(pl.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func GetTestParameters(t *testing.T) {
for _, pl := range testData.Parameters {
- resp, _, err := TOSession.GetParameterByName(pl.Name)
+ resp, _, err := TOSession.GetParameterByName(pl.Name, nil)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", err, resp)
}
@@ -109,7 +161,7 @@ func DeleteTestParameters(t *testing.T) {
func DeleteTestParameter(t *testing.T, pl tc.Parameter) {
// Retrieve the Parameter by name so we can get the id for the Update
- resp, _, err := TOSession.GetParameterByNameAndConfigFile(pl.Name, pl.ConfigFile)
+ resp, _, err := TOSession.GetParameterByNameAndConfigFile(pl.Name, pl.ConfigFile, nil)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", pl.Name, err)
}
@@ -128,7 +180,7 @@ func DeleteTestParameter(t *testing.T, pl tc.Parameter) {
}
// Retrieve the Parameter to see if it got deleted
- pls, _, err := TOSession.GetParameterByID(pl.ID)
+ pls, _, err := TOSession.GetParameterByID(pl.ID, nil)
if err != nil {
t.Errorf("error deleting Parameter name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/phys_locations_test.go b/traffic_ops/testing/api/v3/phys_locations_test.go
index 1b4a4d1..e2e44b3 100644
--- a/traffic_ops/testing/api/v3/phys_locations_test.go
+++ b/traffic_ops/testing/api/v3/phys_locations_test.go
@@ -16,21 +16,74 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"sort"
"testing"
+ "time"
tc "github.com/apache/trafficcontrol/lib/go-tc"
)
func TestPhysLocations(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Parameters, Divisions, Regions, PhysLocations}, func() {
+ GetTestPhysLocationsIMS(t)
GetDefaultSortPhysLocationsTest(t)
GetSortPhysLocationsTest(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestPhysLocations(t)
GetTestPhysLocations(t)
+ GetTestPhysLocationsIMSAfterChange(t, header)
})
}
+func GetTestPhysLocationsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, cdn := range testData.PhysLocations {
+ _, reqInf, err := TOSession.GetPhysLocationByName(cdn.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+
+}
+
+func GetTestPhysLocationsIMSAfterChange(t *testing.T, header http.Header) {
+ for _, cdn := range testData.PhysLocations {
+ _, reqInf, err := TOSession.GetPhysLocationByName(cdn.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, cdn := range testData.PhysLocations {
+ _, reqInf, err := TOSession.GetPhysLocationByName(cdn.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestPhysLocations(t *testing.T) {
for _, pl := range testData.PhysLocations {
resp, _, err := TOSession.CreatePhysLocation(pl)
@@ -46,7 +99,7 @@ func UpdateTestPhysLocations(t *testing.T) {
firstPhysLocation := testData.PhysLocations[0]
// Retrieve the PhysLocation by name so we can get the id for the Update
- resp, _, err := TOSession.GetPhysLocationByName(firstPhysLocation.Name)
+ resp, _, err := TOSession.GetPhysLocationByName(firstPhysLocation.Name, nil)
if err != nil {
t.Errorf("cannot GET PhysLocation by name: '%s', %v", firstPhysLocation.Name, err)
}
@@ -60,7 +113,7 @@ func UpdateTestPhysLocations(t *testing.T) {
}
// Retrieve the PhysLocation to check PhysLocation name got updated
- resp, _, err = TOSession.GetPhysLocationByID(remotePhysLocation.ID)
+ resp, _, err = TOSession.GetPhysLocationByID(remotePhysLocation.ID, nil)
if err != nil {
t.Errorf("cannot GET PhysLocation by name: '$%s', %v", firstPhysLocation.Name, err)
}
@@ -74,7 +127,7 @@ func UpdateTestPhysLocations(t *testing.T) {
func GetTestPhysLocations(t *testing.T) {
for _, cdn := range testData.PhysLocations {
- resp, _, err := TOSession.GetPhysLocationByName(cdn.Name)
+ resp, _, err := TOSession.GetPhysLocationByName(cdn.Name, nil)
if err != nil {
t.Errorf("cannot GET PhysLocation by name: %v - %v", err, resp)
}
@@ -83,7 +136,7 @@ func GetTestPhysLocations(t *testing.T) {
}
func GetSortPhysLocationsTest(t *testing.T) {
- resp, _, err := TOSession.GetPhysLocations(map[string]string{"orderby": "id"})
+ resp, _, err := TOSession.GetPhysLocations(map[string]string{"orderby": "id"}, nil)
if err != nil {
t.Error(err.Error())
}
@@ -96,7 +149,7 @@ func GetSortPhysLocationsTest(t *testing.T) {
}
func GetDefaultSortPhysLocationsTest(t *testing.T) {
- resp, _, err := TOSession.GetPhysLocations(nil)
+ resp, _, err := TOSession.GetPhysLocations(nil, nil)
if err != nil {
t.Error(err.Error())
}
@@ -112,7 +165,7 @@ func DeleteTestPhysLocations(t *testing.T) {
for _, cdn := range testData.PhysLocations {
// Retrieve the PhysLocation by name so we can get the id for the Update
- resp, _, err := TOSession.GetPhysLocationByName(cdn.Name)
+ resp, _, err := TOSession.GetPhysLocationByName(cdn.Name, nil)
if err != nil {
t.Errorf("cannot GET PhysLocation by name: %v - %v", cdn.Name, err)
}
@@ -125,7 +178,7 @@ func DeleteTestPhysLocations(t *testing.T) {
}
// Retrieve the PhysLocation to see if it got deleted
- cdns, _, err := TOSession.GetPhysLocationByName(cdn.Name)
+ cdns, _, err := TOSession.GetPhysLocationByName(cdn.Name, nil)
if err != nil {
t.Errorf("error deleting PhysLocation name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/profile_parameters_test.go b/traffic_ops/testing/api/v3/profile_parameters_test.go
index 60a009d..94562e9 100644
--- a/traffic_ops/testing/api/v3/profile_parameters_test.go
+++ b/traffic_ops/testing/api/v3/profile_parameters_test.go
@@ -17,8 +17,11 @@ package v3
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"sync"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -27,20 +30,39 @@ const queryParamFormat = "?profileId=%d¶meterId=%d"
func TestProfileParameters(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Parameters, Profiles, ProfileParameters}, func() {
+ GetTestProfileParametersIMS(t)
GetTestProfileParameters(t)
})
}
+func GetTestProfileParametersIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, pp := range testData.ProfileParameters {
+ queryParams := fmt.Sprintf(queryParamFormat, pp.ProfileID, pp.ParameterID)
+ _, reqInf, err := TOSession.GetProfileParameterByQueryParams(queryParams, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestProfileParameters(t *testing.T) {
firstProfile := testData.Profiles[0]
- profileResp, _, err := TOSession.GetProfileByName(firstProfile.Name)
+ profileResp, _, err := TOSession.GetProfileByName(firstProfile.Name, nil)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", firstProfile.Name, err)
}
firstParameter := testData.Parameters[0]
- paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name)
+ paramResp, _, err := TOSession.GetParameterByName(firstParameter.Name, nil)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", firstParameter.Name, err)
}
@@ -64,7 +86,7 @@ func GetTestProfileParameters(t *testing.T) {
for _, pp := range testData.ProfileParameters {
queryParams := fmt.Sprintf(queryParamFormat, pp.ProfileID, pp.ParameterID)
- resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams)
+ resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams, nil)
if err != nil {
t.Errorf("cannot GET Parameter by name: %v - %v", err, resp)
}
@@ -97,7 +119,7 @@ func DeleteTestProfileParameter(t *testing.T, pp tc.ProfileParameter) {
queryParams := fmt.Sprintf(queryParamFormat, pp.ProfileID, pp.ParameterID)
// Retrieve the PtofileParameter by profile so we can get the id for the Update
- resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams)
+ resp, _, err := TOSession.GetProfileParameterByQueryParams(queryParams, nil)
if err != nil {
t.Errorf("cannot GET Parameter by profile: %v - %v", pp.Profile, err)
}
@@ -110,7 +132,7 @@ func DeleteTestProfileParameter(t *testing.T, pp tc.ProfileParameter) {
}
// Retrieve the Parameter to see if it got deleted
- pps, _, err := TOSession.GetProfileParameterByQueryParams(queryParams)
+ pps, _, err := TOSession.GetProfileParameterByQueryParams(queryParams, nil)
if err != nil {
t.Errorf("error deleting Parameter name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/profiles_test.go b/traffic_ops/testing/api/v3/profiles_test.go
index 9b77d13..ae880e5 100644
--- a/traffic_ops/testing/api/v3/profiles_test.go
+++ b/traffic_ops/testing/api/v3/profiles_test.go
@@ -16,8 +16,11 @@
package v3
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"strings"
"testing"
+ "time"
tc "github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-util"
@@ -27,6 +30,7 @@ func TestProfiles(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Profiles, Parameters}, func() {
CreateBadProfiles(t)
UpdateTestProfiles(t)
+ GetTestProfilesIMS(t)
GetTestProfiles(t)
GetTestProfilesWithParameters(t)
ImportProfile(t)
@@ -34,6 +38,30 @@ func TestProfiles(t *testing.T) {
})
}
+func GetTestProfilesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, pr := range testData.Profiles {
+ _, reqInf, err := TOSession.GetProfileByName(pr.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ _, reqInf, err = TOSession.GetProfileByParameter(pr.Parameter, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
// CreateBadProfiles ensures that profiles can't be created with bad values
func CreateBadProfiles(t *testing.T) {
@@ -112,7 +140,7 @@ func CopyProfile(t *testing.T) {
// Cleanup profiles
for _, name := range newProfileNames {
- profiles, _, err := TOSession.GetProfileByName(name)
+ profiles, _, err := TOSession.GetProfileByName(name, nil)
if err != nil {
t.Fatalf("got err= %s; expected err= nil", err)
}
@@ -135,7 +163,7 @@ func CreateTestProfiles(t *testing.T) {
if err != nil {
t.Errorf("could not CREATE profiles with name: %s %v", pr.Name, err)
}
- profiles, _, err := TOSession.GetProfileByName(pr.Name)
+ profiles, _, err := TOSession.GetProfileByName(pr.Name, nil)
if err != nil {
t.Errorf("could not GET profile with name: %s %v", pr.Name, err)
}
@@ -157,7 +185,7 @@ func CreateTestProfiles(t *testing.T) {
continue
}
}
- p, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(*param.Name, *param.ConfigFile, *param.Value)
+ p, _, err := TOSession.GetParameterByNameAndConfigFileAndValue(*param.Name, *param.ConfigFile, *param.Value, nil)
if err != nil {
t.Errorf("could not GET parameter %+v: %s", param, err.Error())
}
@@ -177,7 +205,7 @@ func UpdateTestProfiles(t *testing.T) {
firstProfile := testData.Profiles[0]
// Retrieve the Profile by name so we can get the id for the Update
- resp, _, err := TOSession.GetProfileByName(firstProfile.Name)
+ resp, _, err := TOSession.GetProfileByName(firstProfile.Name, nil)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", firstProfile.Name, err)
}
@@ -191,7 +219,7 @@ func UpdateTestProfiles(t *testing.T) {
}
// Retrieve the Profile to check Profile name got updated
- resp, _, err = TOSession.GetProfileByID(remoteProfile.ID)
+ resp, _, err = TOSession.GetProfileByID(remoteProfile.ID, nil)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", firstProfile.Name, err)
}
@@ -205,18 +233,18 @@ func UpdateTestProfiles(t *testing.T) {
func GetTestProfiles(t *testing.T) {
for _, pr := range testData.Profiles {
- resp, _, err := TOSession.GetProfileByName(pr.Name)
+ resp, _, err := TOSession.GetProfileByName(pr.Name, nil)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", err, resp)
}
profileID := resp[0].ID
- resp, _, err = TOSession.GetProfileByParameter(pr.Parameter)
+ resp, _, err = TOSession.GetProfileByParameter(pr.Parameter, nil)
if err != nil {
t.Errorf("cannot GET Profile by param: %v - %v", err, resp)
}
- resp, _, err = TOSession.GetProfileByCDNID(pr.CDNID)
+ resp, _, err = TOSession.GetProfileByCDNID(pr.CDNID, nil)
if err != nil {
t.Errorf("cannot GET Profile by cdn: %v - %v", err, resp)
}
@@ -234,7 +262,7 @@ func GetTestProfiles(t *testing.T) {
func ImportProfile(t *testing.T) {
// Get ID of Profile to export
- resp, _, err := TOSession.GetProfileByName(testData.Profiles[0].Name)
+ resp, _, err := TOSession.GetProfileByName(testData.Profiles[0].Name, nil)
if err != nil {
t.Fatalf("cannot GET Profile by name: %v - %v", err, resp)
}
@@ -297,7 +325,7 @@ func ImportProfile(t *testing.T) {
func GetTestProfilesWithParameters(t *testing.T) {
firstProfile := testData.Profiles[0]
- resp, _, err := TOSession.GetProfileByName(firstProfile.Name)
+ resp, _, err := TOSession.GetProfileByName(firstProfile.Name, nil)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", err, resp)
return
@@ -308,7 +336,7 @@ func GetTestProfilesWithParameters(t *testing.T) {
}
respProfile := resp[0]
// query by name does not retrieve associated parameters. But query by id does.
- resp, _, err = TOSession.GetProfileByID(respProfile.ID)
+ resp, _, err = TOSession.GetProfileByID(respProfile.ID, nil)
if err != nil {
t.Errorf("cannot GET Profile by name: %v - %v", err, resp)
}
@@ -325,7 +353,7 @@ func DeleteTestProfiles(t *testing.T) {
for _, pr := range testData.Profiles {
// Retrieve the Profile by name so we can get the id for the Update
- resp, _, err := TOSession.GetProfileByName(pr.Name)
+ resp, _, err := TOSession.GetProfileByName(pr.Name, nil)
if err != nil {
t.Errorf("cannot GET Profile by name: %s - %v", pr.Name, err)
continue
@@ -337,7 +365,7 @@ func DeleteTestProfiles(t *testing.T) {
profileID := resp[0].ID
// query by name does not retrieve associated parameters. But query by id does.
- resp, _, err = TOSession.GetProfileByID(profileID)
+ resp, _, err = TOSession.GetProfileByID(profileID, nil)
if err != nil {
t.Errorf("cannot GET Profile by id: %v - %v", err, resp)
}
@@ -356,7 +384,7 @@ func DeleteTestProfiles(t *testing.T) {
//time.Sleep(1 * time.Second)
// Retrieve the Profile to see if it got deleted
- prs, _, err := TOSession.GetProfileByName(pr.Name)
+ prs, _, err := TOSession.GetProfileByName(pr.Name, nil)
if err != nil {
t.Errorf("error deleting Profile name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/readonlycannotmodify_test.go b/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
index eec7222..9d92c77 100644
--- a/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
+++ b/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
@@ -62,7 +62,7 @@ func CreateTestCDNWithReadOnlyUser(t *testing.T) {
}
}
- cdns, _, _ := TOSession.GetCDNByName(cdn.Name)
+ cdns, _, _ := TOSession.GetCDNByName(cdn.Name, nil)
if len(cdns) > 0 {
t.Errorf("readonlyuser getting created cdn, len(cdns) expected: 0, actual: %+v %+v", len(cdns), cdns)
}
diff --git a/traffic_ops/testing/api/v3/regions_test.go b/traffic_ops/testing/api/v3/regions_test.go
index cb6d954..b3d638d 100644
--- a/traffic_ops/testing/api/v3/regions_test.go
+++ b/traffic_ops/testing/api/v3/regions_test.go
@@ -16,20 +16,72 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"strings"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
func TestRegions(t *testing.T) {
WithObjs(t, []TCObj{Parameters, Divisions, Regions}, func() {
+ GetTestRegionsIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestRegions(t)
GetTestRegions(t)
+ GetTestRegionsIMSAfterChange(t, header)
DeleteTestRegionsByName(t)
})
}
+func GetTestRegionsIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, region := range testData.Regions {
+ _, reqInf, err := TOSession.GetRegionByName(region.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestRegionsIMSAfterChange(t *testing.T, header http.Header) {
+ for _, region := range testData.Regions {
+ _, reqInf, err := TOSession.GetRegionByName(region.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, region := range testData.Regions {
+ _, reqInf, err := TOSession.GetRegionByName(region.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestRegions(t *testing.T) {
for _, region := range testData.Regions {
@@ -45,7 +97,7 @@ func UpdateTestRegions(t *testing.T) {
firstRegion := testData.Regions[0]
// Retrieve the Region by region so we can get the id for the Update
- resp, _, err := TOSession.GetRegionByName(firstRegion.Name)
+ resp, _, err := TOSession.GetRegionByName(firstRegion.Name, nil)
if err != nil {
t.Errorf("cannot GET Region by region: %v - %v", firstRegion.Name, err)
}
@@ -59,7 +111,7 @@ func UpdateTestRegions(t *testing.T) {
}
// Retrieve the Region to check region got updated
- resp, _, err = TOSession.GetRegionByID(remoteRegion.ID)
+ resp, _, err = TOSession.GetRegionByID(remoteRegion.ID, nil)
if err != nil {
t.Errorf("cannot GET Region by region: %v - %v", firstRegion.Name, err)
}
@@ -79,7 +131,7 @@ func UpdateTestRegions(t *testing.T) {
func GetTestRegions(t *testing.T) {
for _, region := range testData.Regions {
- resp, _, err := TOSession.GetRegionByName(region.Name)
+ resp, _, err := TOSession.GetRegionByName(region.Name, nil)
if err != nil {
t.Errorf("cannot GET Region by region: %v - %v", err, resp)
}
@@ -105,7 +157,7 @@ func DeleteTestRegionsByName(t *testing.T) {
}
// Retrieve the Region to see if it got deleted
- regionResp, _, err := TOSession.GetRegionByName(region.Name)
+ regionResp, _, err := TOSession.GetRegionByName(region.Name, nil)
if err != nil {
t.Errorf("error deleting Region region: %s", err.Error())
}
@@ -121,7 +173,7 @@ func DeleteTestRegions(t *testing.T) {
for _, region := range testData.Regions {
// Retrieve the Region by name so we can get the id
- resp, _, err := TOSession.GetRegionByName(region.Name)
+ resp, _, err := TOSession.GetRegionByName(region.Name, nil)
if err != nil {
t.Errorf("cannot GET Region by name: %v - %v", region.Name, err)
}
@@ -133,7 +185,7 @@ func DeleteTestRegions(t *testing.T) {
}
// Retrieve the Region to see if it got deleted
- regionResp, _, err := TOSession.GetRegionByName(region.Name)
+ regionResp, _, err := TOSession.GetRegionByName(region.Name, nil)
if err != nil {
t.Errorf("error deleting Region region: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/roles_test.go b/traffic_ops/testing/api/v3/roles_test.go
index db38a2b..aebc81b 100644
--- a/traffic_ops/testing/api/v3/roles_test.go
+++ b/traffic_ops/testing/api/v3/roles_test.go
@@ -16,8 +16,11 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"reflect"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
)
@@ -31,12 +34,58 @@ const (
func TestRoles(t *testing.T) {
WithObjs(t, []TCObj{Roles}, func() {
+ GetTestRolesIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestRoles(t)
GetTestRoles(t)
+ GetTestRolesIMSAfterChange(t, header)
VerifyGetRolesOrder(t)
})
}
+func GetTestRolesIMSAfterChange(t *testing.T, header http.Header) {
+ role := testData.Roles[roleGood]
+ _, reqInf, _, err := TOSession.GetRoleByName(*role.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ _, reqInf, _, err = TOSession.GetRoleByName(*role.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
+func GetTestRolesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ role := testData.Roles[roleGood]
+ _, reqInf, _, err := TOSession.GetRoleByName(*role.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+
+}
+
func CreateTestRoles(t *testing.T) {
expectedAlerts := []tc.Alerts{tc.Alerts{[]tc.Alert{tc.Alert{"role was created.", "success"}}}, tc.Alerts{[]tc.Alert{tc.Alert{"can not add non-existent capabilities: [invalid-capability]", "error"}}}, tc.Alerts{[]tc.Alert{tc.Alert{"role was created.", "success"}}}}
for i, role := range testData.Roles {
@@ -58,7 +107,7 @@ func UpdateTestRoles(t *testing.T) {
t.Logf("testData.Roles contains: %+v\n", testData.Roles)
firstRole := testData.Roles[0]
// Retrieve the Role by role so we can get the id for the Update
- resp, _, status, err := TOSession.GetRoleByName(*firstRole.Name)
+ resp, _, status, err := TOSession.GetRoleByName(*firstRole.Name, nil)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", firstRole.Name, err)
@@ -75,7 +124,7 @@ func UpdateTestRoles(t *testing.T) {
}
// Retrieve the Role to check role got updated
- resp, _, status, err = TOSession.GetRoleByID(*remoteRole.ID)
+ resp, _, status, err = TOSession.GetRoleByID(*remoteRole.ID, nil)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", firstRole.Name, err)
@@ -97,7 +146,7 @@ func UpdateTestRoles(t *testing.T) {
func GetTestRoles(t *testing.T) {
role := testData.Roles[roleGood]
- resp, _, status, err := TOSession.GetRoleByName(*role.Name)
+ resp, _, status, err := TOSession.GetRoleByName(*role.Name, nil)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", err, resp)
@@ -110,13 +159,13 @@ func VerifyGetRolesOrder(t *testing.T) {
"orderby": "name",
"sortOrder": "desc",
}
- descResp, _, status, err := TOSession.GetRoleByQueryParams(params)
+ descResp, _, status, err := TOSession.GetRoleByQueryParams(params, nil)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", err, descResp)
}
params["sortOrder"] = "asc"
- ascResp, _, status, err := TOSession.GetRoleByQueryParams(params)
+ ascResp, _, status, err := TOSession.GetRoleByQueryParams(params, nil)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by role: %v - %v", err, ascResp)
@@ -139,7 +188,7 @@ func DeleteTestRoles(t *testing.T) {
role := testData.Roles[roleGood]
// Retrieve the Role by name so we can get the id
- resp, _, status, err := TOSession.GetRoleByName(*role.Name)
+ resp, _, status, err := TOSession.GetRoleByName(*role.Name, nil)
t.Log("Status Code: ", status)
if err != nil {
t.Errorf("cannot GET Role by name: %v - %v", role.Name, err)
@@ -154,7 +203,7 @@ func DeleteTestRoles(t *testing.T) {
}
// Retrieve the Role to see if it got deleted
- roleResp, _, status, err := TOSession.GetRoleByName(*role.Name)
+ roleResp, _, status, err := TOSession.GetRoleByName(*role.Name, nil)
t.Log("Status Code: ", status)
if err != nil {
diff --git a/traffic_ops/testing/api/v3/servercapabilities_test.go b/traffic_ops/testing/api/v3/servercapabilities_test.go
index b0aa6fd..6a9417a 100644
--- a/traffic_ops/testing/api/v3/servercapabilities_test.go
+++ b/traffic_ops/testing/api/v3/servercapabilities_test.go
@@ -16,9 +16,8 @@ package v3
*/
import (
- "testing"
-
"github.com/apache/trafficcontrol/lib/go-tc"
+ "testing"
)
func TestServerCapabilities(t *testing.T) {
@@ -43,7 +42,7 @@ func CreateTestServerCapabilities(t *testing.T) {
func GetTestServerCapabilities(t *testing.T) {
for _, sc := range testData.ServerCapabilities {
- resp, _, err := TOSession.GetServerCapability(sc.Name)
+ resp, _, err := TOSession.GetServerCapability(sc.Name, nil)
if err != nil {
t.Errorf("cannot GET server capability: %v - %v", err, resp)
} else if resp == nil {
@@ -51,7 +50,7 @@ func GetTestServerCapabilities(t *testing.T) {
}
}
- resp, _, err := TOSession.GetServerCapabilities()
+ resp, _, err := TOSession.GetServerCapabilities(nil)
if err != nil {
t.Errorf("cannot GET server capabilities: %v", err)
}
@@ -75,7 +74,7 @@ func DeleteTestServerCapabilities(t *testing.T) {
t.Errorf("cannot DELETE server capability: %v - %v", err, delResp)
}
- serverCapability, _, err := TOSession.GetServerCapability(sc.Name)
+ serverCapability, _, err := TOSession.GetServerCapability(sc.Name, nil)
if err == nil {
t.Errorf("expected error trying to GET deleted server capability: %s, actual: nil", sc.Name)
}
diff --git a/traffic_ops/testing/api/v3/servers_test.go b/traffic_ops/testing/api/v3/servers_test.go
index c77f282..43bf566 100644
--- a/traffic_ops/testing/api/v3/servers_test.go
+++ b/traffic_ops/testing/api/v3/servers_test.go
@@ -16,20 +16,89 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"net/url"
"strconv"
"testing"
+ "time"
)
func TestServers(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Users, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Topologies, DeliveryServices, Servers}, func() {
+ GetTestServersIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestServers(t)
GetTestServersDetails(t)
GetTestServers(t)
+ GetTestServersIMSAfterChange(t, header)
GetTestServersQueryParameters(t)
})
}
+func GetTestServersIMSAfterChange(t *testing.T, header http.Header) {
+ params := url.Values{}
+ for _, server := range testData.Servers {
+ if server.HostName == nil {
+ t.Errorf("found server with nil hostname: %+v", server)
+ continue
+ }
+ params.Set("hostName", *server.HostName)
+ _, reqInf, err := TOSession.GetServers(¶ms, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, server := range testData.Servers {
+ if server.HostName == nil {
+ t.Errorf("found server with nil hostname: %+v", server)
+ continue
+ }
+ params.Set("hostName", *server.HostName)
+ _, reqInf, err := TOSession.GetServers(¶ms, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestServersIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ params := url.Values{}
+ for _, server := range testData.Servers {
+ if server.HostName == nil {
+ t.Errorf("found server with nil hostname: %+v", server)
+ continue
+ }
+ params.Set("hostName", *server.HostName)
+ _, reqInf, err := TOSession.GetServers(¶ms, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestServers(t *testing.T) {
// loop through servers, assign FKs and create
for _, server := range testData.Servers {
@@ -53,7 +122,7 @@ func GetTestServers(t *testing.T) {
continue
}
params.Set("hostName", *server.HostName)
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Errorf("cannot GET Server by name '%s': %v - %v", *server.HostName, err, resp.Alerts)
} else if resp.Summary.Count != 1 {
@@ -69,7 +138,7 @@ func GetTestServersDetails(t *testing.T) {
t.Errorf("found server with nil hostname: %+v", server)
continue
}
- resp, _, err := TOSession.GetServerDetailsByHostName(*server.HostName)
+ resp, _, err := TOSession.GetServerDetailsByHostName(*server.HostName, nil)
if err != nil {
t.Errorf("cannot GET Server Details by name: %v - %v", err, resp)
}
@@ -77,7 +146,7 @@ func GetTestServersDetails(t *testing.T) {
}
func GetTestServersQueryParameters(t *testing.T) {
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("Failed to get Delivery Services: %v", err)
}
@@ -92,13 +161,13 @@ func GetTestServersQueryParameters(t *testing.T) {
params := url.Values{}
params.Add("dsId", strconv.Itoa(*ds.ID))
- _, _, err = TOSession.GetServers(¶ms)
+ _, _, err = TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("Failed to get server by Delivery Service ID: %v", err)
}
params.Del("dsId")
- resp, _, err := TOSession.GetServers(nil)
+ resp, _, err := TOSession.GetServers(nil, nil)
if err != nil {
t.Fatalf("Failed to get servers: %v", err)
}
@@ -110,7 +179,7 @@ func GetTestServersQueryParameters(t *testing.T) {
s := resp.Response[0]
params.Add("type", s.Type)
- if _, _, err := TOSession.GetServers(¶ms); err != nil {
+ if _, _, err := TOSession.GetServers(¶ms, nil); err != nil {
t.Errorf("Error getting servers by type: %v", err)
}
params.Del("type")
@@ -119,7 +188,7 @@ func GetTestServersQueryParameters(t *testing.T) {
t.Error("Found server with no Cache Group ID")
} else {
params.Add("cachegroup", strconv.Itoa(*s.CachegroupID))
- if _, _, err := TOSession.GetServers(¶ms); err != nil {
+ if _, _, err := TOSession.GetServers(¶ms, nil); err != nil {
t.Errorf("Error getting servers by Cache Group ID: %v", err)
}
params.Del("cachegroup")
@@ -129,7 +198,7 @@ func GetTestServersQueryParameters(t *testing.T) {
t.Error("Found server with no status")
} else {
params.Add("status", *s.Status)
- if _, _, err := TOSession.GetServers(¶ms); err != nil {
+ if _, _, err := TOSession.GetServers(¶ms, nil); err != nil {
t.Errorf("Error getting servers by status: %v", err)
}
params.Del("status")
@@ -139,13 +208,13 @@ func GetTestServersQueryParameters(t *testing.T) {
t.Error("Found server with no Profile ID")
} else {
params.Add("profileId", strconv.Itoa(*s.ProfileID))
- if _, _, err := TOSession.GetServers(¶ms); err != nil {
+ if _, _, err := TOSession.GetServers(¶ms, nil); err != nil {
t.Errorf("Error getting servers by Profile ID: %v", err)
}
params.Del("profileId")
}
- cgs, _, err := TOSession.GetCacheGroupsNullable()
+ cgs, _, err := TOSession.GetCacheGroupsNullable(nil)
if err != nil {
t.Fatalf("Failed to get Cache Groups: %v", err)
}
@@ -157,7 +226,7 @@ func GetTestServersQueryParameters(t *testing.T) {
}
params.Add("parentCacheGroup", strconv.Itoa(*cgs[0].ID))
- if _, _, err = TOSession.GetServers(¶ms); err != nil {
+ if _, _, err = TOSession.GetServers(¶ms, nil); err != nil {
t.Errorf("Error getting servers by parentCacheGroup: %v", err)
}
params.Del("parentCacheGroup")
@@ -178,7 +247,7 @@ func UpdateTestServers(t *testing.T) {
params.Add("hostName", hostName)
// Retrieve the server by hostname so we can get the id for the Update
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("cannot GET Server by hostname '%s': %v - %v", hostName, err, resp.Alerts)
}
@@ -216,7 +285,7 @@ func UpdateTestServers(t *testing.T) {
}
// Retrieve the server to check rack and interfaceName values were updated
- resp, _, err = TOSession.GetServers(¶ms)
+ resp, _, err = TOSession.GetServers(¶ms, nil)
if err != nil {
t.Errorf("cannot GET Server by ID: %v - %v", remoteServer.HostName, err)
}
@@ -253,7 +322,7 @@ func UpdateTestServers(t *testing.T) {
}
// Assign server to DS and then attempt to update to a different type
- dses, _, err := TOSession.GetDeliveryServicesNullable()
+ dses, _, err := TOSession.GetDeliveryServicesNullable(nil)
if err != nil {
t.Fatalf("cannot GET DeliveryServices: %v", err)
}
@@ -261,7 +330,7 @@ func UpdateTestServers(t *testing.T) {
t.Fatal("GET DeliveryServices returned no dses, must have at least 1 to test invalid type server update")
}
- serverTypes, _, err := TOSession.GetTypes("server")
+ serverTypes, _, err := TOSession.GetTypes(nil, "server")
if err != nil {
t.Fatalf("cannot GET Server Types: %v", err)
}
@@ -301,7 +370,7 @@ func DeleteTestServers(t *testing.T) {
params.Set("hostName", *server.HostName)
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Errorf("cannot GET Server by hostname '%s': %v - %v", *server.HostName, err, resp.Alerts)
continue
@@ -325,7 +394,7 @@ func DeleteTestServers(t *testing.T) {
}
// Retrieve the Server to see if it got deleted
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Errorf("error deleting Server hostname '%s': %v - %v", *server.HostName, err, resp.Alerts)
}
diff --git a/traffic_ops/testing/api/v3/servers_to_deliveryservice_assignment_test.go b/traffic_ops/testing/api/v3/servers_to_deliveryservice_assignment_test.go
index dee4472..2945229 100644
--- a/traffic_ops/testing/api/v3/servers_to_deliveryservice_assignment_test.go
+++ b/traffic_ops/testing/api/v3/servers_to_deliveryservice_assignment_test.go
@@ -43,7 +43,7 @@ func AssignTestDeliveryService(t *testing.T) {
params := url.Values{}
params.Add("hostName", *server.HostName)
- rs, _, err := TOSession.GetServers(¶ms)
+ rs, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("Failed to fetch server information: %v", err)
} else if len(rs.Response) == 0 {
@@ -54,7 +54,7 @@ func AssignTestDeliveryService(t *testing.T) {
t.Fatalf("Server '%s' had nil ID", *server.HostName)
}
- rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*testData.DeliveryServices[0].XMLID)
+ rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*testData.DeliveryServices[0].XMLID, nil)
if err != nil {
t.Fatalf("Failed to fetch DS information: %v", err)
} else if len(rd) == 0 {
@@ -71,7 +71,7 @@ func AssignTestDeliveryService(t *testing.T) {
}
t.Logf("alerts: %+v", alerts)
- response, _, err := TOSession.GetServerIDDeliveryServices(*firstServer.ID)
+ response, _, err := TOSession.GetServerIDDeliveryServices(*firstServer.ID, nil)
t.Logf("response: %+v", response)
if err != nil {
t.Fatalf("Couldn't get Delivery Services assigned to Server '%+v': %v", firstServer, err)
@@ -108,7 +108,7 @@ func AssignIncorrectTestDeliveryService(t *testing.T) {
params := url.Values{}
params.Add("hostName", hostname)
- rs, _, err := TOSession.GetServers(¶ms)
+ rs, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("Failed to fetch server information: %v - %v", err, rs.Alerts)
} else if len(rs.Response) == 0 {
@@ -119,7 +119,7 @@ func AssignIncorrectTestDeliveryService(t *testing.T) {
t.Fatalf("Server '%s' has nil ID", hostname)
}
- rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*testData.DeliveryServices[0].XMLID)
+ rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable(*testData.DeliveryServices[0].XMLID, nil)
if err != nil {
t.Fatalf("Failed to fetch DS information: %v", err)
} else if len(rd) == 0 {
@@ -135,7 +135,7 @@ func AssignIncorrectTestDeliveryService(t *testing.T) {
t.Errorf("Expected bad assignment to fail, but it didn't! (alerts: %v)", alerts)
}
- response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID)
+ response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID, nil)
t.Logf("response: %+v", response)
if err != nil {
t.Fatalf("Couldn't get Delivery Services assigned to Server '%+v': %v", *server, err)
@@ -169,7 +169,7 @@ func AssignTopologyBasedDeliveryService(t *testing.T) {
params := url.Values{}
params.Add("hostName", *server.HostName)
- rs, _, err := TOSession.GetServers(¶ms)
+ rs, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("Failed to fetch server information: %v", err)
} else if len(rs.Response) == 0 {
@@ -180,7 +180,7 @@ func AssignTopologyBasedDeliveryService(t *testing.T) {
t.Fatal("Server had nil ID")
}
- rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds-top")
+ rd, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds-top", nil)
if err != nil {
t.Fatalf("Failed to fetch DS information: %v", err)
} else if len(rd) == 0 {
@@ -199,7 +199,7 @@ func AssignTopologyBasedDeliveryService(t *testing.T) {
t.Fatalf("assigning Topology-based delivery service to server - expected: 400-level status code, actual: %d", reqInf.StatusCode)
}
- response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID)
+ response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID, nil)
t.Logf("response: %+v", response)
if err != nil {
t.Fatalf("Couldn't get Delivery Services assigned to Server '%+v': %v", *server, err)
diff --git a/traffic_ops/testing/api/v3/serverservercapability_test.go b/traffic_ops/testing/api/v3/serverservercapability_test.go
index c2dbe7a..d9e8e77 100644
--- a/traffic_ops/testing/api/v3/serverservercapability_test.go
+++ b/traffic_ops/testing/api/v3/serverservercapability_test.go
@@ -16,8 +16,11 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"net/url"
"testing"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-util"
@@ -25,10 +28,26 @@ import (
func TestServerServerCapabilities(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies, DeliveryServices, ServerCapabilities, DeliveryServicesRequiredCapabilities, ServerServerCapabilities}, func() {
+ GetTestServerServerCapabilitiesIMS(t)
GetTestServerServerCapabilities(t)
})
}
+func GetTestServerServerCapabilitiesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetServerServerCapabilities(nil, nil, nil, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func CreateTestServerServerCapabilities(t *testing.T) {
// Valid POSTs
@@ -39,7 +58,7 @@ func CreateTestServerServerCapabilities(t *testing.T) {
t.Fatalf("server-server-capability structure had nil server")
}
params.Set("hostName", *ssc.Server)
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("cannot GET Server by hostname '%s': %v - %v", *ssc.Server, err, resp.Alerts)
}
@@ -107,7 +126,7 @@ func CreateTestServerServerCapabilities(t *testing.T) {
// Attempt to assign a server capability to a non MID/EDGE server
// TODO: DON'T hard-code server hostnames!
params.Set("hostName", "riak")
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("cannot GET Server by hostname 'riak': %v - %v", err, resp.Alerts)
}
@@ -128,7 +147,7 @@ func CreateTestServerServerCapabilities(t *testing.T) {
func GetTestServerServerCapabilities(t *testing.T) {
// Get All Server Capabilities
- sscs, _, err := TOSession.GetServerServerCapabilities(nil, nil, nil)
+ sscs, _, err := TOSession.GetServerServerCapabilities(nil, nil, nil, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers: %v", err)
}
@@ -150,20 +169,20 @@ func GetTestServerServerCapabilities(t *testing.T) {
for _, ssc := range sscs {
// Get assigned Server Capabilities by server id
- sscs, _, err := TOSession.GetServerServerCapabilities(ssc.ServerID, nil, nil)
+ sscs, _, err := TOSession.GetServerServerCapabilities(ssc.ServerID, nil, nil, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers by server ID %v: %v", *ssc.ServerID, err)
}
checkResp(t, sscs)
// Get assigned Server Capabilities by host name
- sscs, _, err = TOSession.GetServerServerCapabilities(nil, ssc.Server, nil)
+ sscs, _, err = TOSession.GetServerServerCapabilities(nil, ssc.Server, nil, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers by server host name %v: %v", *ssc.Server, err)
}
checkResp(t, sscs)
// Get assigned Server Capabilities by server capability
- sscs, _, err = TOSession.GetServerServerCapabilities(nil, nil, ssc.ServerCapability)
+ sscs, _, err = TOSession.GetServerServerCapabilities(nil, nil, ssc.ServerCapability, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers by server capability %v: %v", *ssc.ServerCapability, err)
}
@@ -173,7 +192,7 @@ func GetTestServerServerCapabilities(t *testing.T) {
func DeleteTestServerServerCapabilities(t *testing.T) {
// Get Server Capabilities to delete them
- sscs, _, err := TOSession.GetServerServerCapabilities(nil, nil, nil)
+ sscs, _, err := TOSession.GetServerServerCapabilities(nil, nil, nil, nil)
if err != nil {
t.Fatalf("cannot GET server capabilities assigned to servers: %v", err)
}
@@ -186,7 +205,7 @@ func DeleteTestServerServerCapabilities(t *testing.T) {
dsServers := []tc.DeliveryServiceServer{}
for _, ssc := range sscs {
- dsReqCapResp, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, nil, ssc.ServerCapability)
+ dsReqCapResp, _, err := TOSession.GetDeliveryServicesRequiredCapabilities(nil, nil, ssc.ServerCapability, nil)
if err != nil {
t.Fatalf("cannot GET delivery service required capabilities: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/serverupdatestatus_test.go b/traffic_ops/testing/api/v3/serverupdatestatus_test.go
index 5382260..2842fc7 100644
--- a/traffic_ops/testing/api/v3/serverupdatestatus_test.go
+++ b/traffic_ops/testing/api/v3/serverupdatestatus_test.go
@@ -59,7 +59,7 @@ func TestServerUpdateStatus(t *testing.T) {
},
} {
params.Set("hostName", s.name)
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Errorf("cannot GET Server by hostname '%s': %v - %v", s.name, err, resp.Alerts)
}
@@ -129,7 +129,7 @@ func TestServerUpdateStatus(t *testing.T) {
}
// update status of MID server to OFFLINE via status ID
- status, _, err := TOSession.GetStatusByName("OFFLINE")
+ status, _, err := TOSession.GetStatusByName("OFFLINE", nil)
if err != nil {
t.Fatalf("cannot GET status by name: %v", err)
}
@@ -208,7 +208,7 @@ func TestServerQueueUpdate(t *testing.T) {
var s tc.ServerNullable
params := url.Values{}
params.Add("hostName", serverName)
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("failed to GET Server by hostname '%s': %v - %v", serverName, err, resp.Alerts)
}
@@ -248,7 +248,7 @@ func TestServerQueueUpdate(t *testing.T) {
}
// assert that the server has updates queued
- resp, _, err = TOSession.GetServers(¶ms)
+ resp, _, err = TOSession.GetServers(¶ms, nil)
if err != nil {
t.Fatalf("failed to GET Server by hostname '%s': %v - %v", serverName, err, resp.Alerts)
}
@@ -284,7 +284,7 @@ func TestServerQueueUpdate(t *testing.T) {
// TODO: don't construct URLs like this, nor use "RawRequest"
path := fmt.Sprintf(TestAPIBase+"/servers/%d/queue_update", *s.ID)
- httpResp, _, err := TOSession.RawRequest(http.MethodPost, path, req)
+ httpResp, _, err := TOSession.RawRequest(http.MethodPost, path, req, nil)
if err != nil {
t.Fatalf("POST request failed: %v", err)
}
@@ -308,7 +308,7 @@ func TestSetServerUpdateStatuses(t *testing.T) {
params := url.Values{}
params.Add("hostName", *testServer.HostName)
testVals := func(queue *bool, reval *bool) {
- resp, _, err := TOSession.GetServers(¶ms)
+ resp, _, err := TOSession.GetServers(¶ms, nil)
if err != nil {
t.Errorf("cannot GET Server by name '%s': %v - %v", *testServer.HostName, err, resp.Alerts)
} else if len(resp.Response) != 1 {
@@ -328,7 +328,7 @@ func TestSetServerUpdateStatuses(t *testing.T) {
t.Fatalf("UpdateServerStatuses error expected: nil, actual: %v", err)
}
- resp, _, err = TOSession.GetServers(¶ms)
+ resp, _, err = TOSession.GetServers(¶ms, nil)
if err != nil {
t.Errorf("cannot GET Server by name '%s': %v - %v", *testServer.HostName, err, resp.Alerts)
} else if len(resp.Response) != 1 {
diff --git a/traffic_ops/testing/api/v3/staticdnsentries_test.go b/traffic_ops/testing/api/v3/staticdnsentries_test.go
index 6863b7e..50bb6f2 100644
--- a/traffic_ops/testing/api/v3/staticdnsentries_test.go
+++ b/traffic_ops/testing/api/v3/staticdnsentries_test.go
@@ -16,7 +16,10 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
"reflect"
@@ -25,12 +28,62 @@ import (
func TestStaticDNSEntries(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies, DeliveryServices, StaticDNSEntries}, func() {
+ GetTestStaticDNSEntriesIMS(t)
GetTestStaticDNSEntries(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestStaticDNSEntries(t)
+ GetTestStaticDNSEntriesIMSAfterChange(t, header)
UpdateTestStaticDNSEntriesInvalidAddress(t)
})
}
+func GetTestStaticDNSEntriesIMSAfterChange(t *testing.T, header http.Header) {
+ for _, staticDNSEntry := range testData.StaticDNSEntries {
+ _, reqInf, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, staticDNSEntry := range testData.StaticDNSEntries {
+ _, reqInf, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestStaticDNSEntriesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+
+ for _, staticDNSEntry := range testData.StaticDNSEntries {
+ _, reqInf, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestStaticDNSEntries(t *testing.T) {
for _, staticDNSEntry := range testData.StaticDNSEntries {
resp, _, err := TOSession.CreateStaticDNSEntry(staticDNSEntry)
@@ -46,7 +99,7 @@ func UpdateTestStaticDNSEntries(t *testing.T) {
firstStaticDNSEntry := testData.StaticDNSEntries[0]
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err := TOSession.GetStaticDNSEntriesByHost(firstStaticDNSEntry.Host)
+ resp, _, err := TOSession.GetStaticDNSEntriesByHost(firstStaticDNSEntry.Host, nil)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '%s', %v", firstStaticDNSEntry.Host, err)
}
@@ -62,7 +115,7 @@ func UpdateTestStaticDNSEntries(t *testing.T) {
}
// Retrieve the StaticDNSEntries to check StaticDNSEntries name got updated
- resp, _, err = TOSession.GetStaticDNSEntryByID(remoteStaticDNSEntry.ID)
+ resp, _, err = TOSession.GetStaticDNSEntryByID(remoteStaticDNSEntry.ID, nil)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '$%s', %v", firstStaticDNSEntry.Host, err)
}
@@ -80,7 +133,7 @@ func UpdateTestStaticDNSEntriesInvalidAddress(t *testing.T) {
// A_RECORD
firstStaticDNSEntry := testData.StaticDNSEntries[0]
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err := TOSession.GetStaticDNSEntriesByHost(firstStaticDNSEntry.Host)
+ resp, _, err := TOSession.GetStaticDNSEntriesByHost(firstStaticDNSEntry.Host, nil)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '%s', %v", firstStaticDNSEntry.Host, err)
}
@@ -101,7 +154,7 @@ func UpdateTestStaticDNSEntriesInvalidAddress(t *testing.T) {
// CNAME_RECORD
secondStaticDNSEntry := testData.StaticDNSEntries[1]
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err = TOSession.GetStaticDNSEntriesByHost(secondStaticDNSEntry.Host)
+ resp, _, err = TOSession.GetStaticDNSEntriesByHost(secondStaticDNSEntry.Host, nil)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '%s', %v", secondStaticDNSEntry.Host, err)
}
@@ -120,7 +173,7 @@ func UpdateTestStaticDNSEntriesInvalidAddress(t *testing.T) {
// AAAA_RECORD
thirdStaticDNSEntry := testData.StaticDNSEntries[2]
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err = TOSession.GetStaticDNSEntriesByHost(thirdStaticDNSEntry.Host)
+ resp, _, err = TOSession.GetStaticDNSEntriesByHost(thirdStaticDNSEntry.Host, nil)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: '%s', %v", thirdStaticDNSEntry.Host, err)
}
@@ -140,7 +193,7 @@ func UpdateTestStaticDNSEntriesInvalidAddress(t *testing.T) {
func GetTestStaticDNSEntries(t *testing.T) {
for _, staticDNSEntry := range testData.StaticDNSEntries {
- resp, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host)
+ resp, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, nil)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: %v - %v", err, resp)
}
@@ -151,7 +204,7 @@ func DeleteTestStaticDNSEntries(t *testing.T) {
for _, staticDNSEntry := range testData.StaticDNSEntries {
// Retrieve the StaticDNSEntries by name so we can get the id for the Update
- resp, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host)
+ resp, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, nil)
if err != nil {
t.Errorf("cannot GET StaticDNSEntries by name: %v - %v", staticDNSEntry.Host, err)
}
@@ -164,7 +217,7 @@ func DeleteTestStaticDNSEntries(t *testing.T) {
}
// Retrieve the StaticDNSEntry to see if it got deleted
- staticDNSEntries, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host)
+ staticDNSEntries, _, err := TOSession.GetStaticDNSEntriesByHost(staticDNSEntry.Host, nil)
if err != nil {
t.Errorf("error deleting StaticDNSEntrie name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/statuses_test.go b/traffic_ops/testing/api/v3/statuses_test.go
index 742ad9f..cd555e1 100644
--- a/traffic_ops/testing/api/v3/statuses_test.go
+++ b/traffic_ops/testing/api/v3/statuses_test.go
@@ -16,18 +16,79 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
tc "github.com/apache/trafficcontrol/lib/go-tc"
)
func TestStatuses(t *testing.T) {
WithObjs(t, []TCObj{Parameters, Statuses}, func() {
+ GetTestStatusesIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestStatuses(t)
GetTestStatuses(t)
+ GetTestStatusesIMSAfterChange(t, header)
})
}
+func GetTestStatusesIMSAfterChange(t *testing.T, header http.Header) {
+ for _, status := range testData.Statuses {
+ if status.Name == nil {
+ t.Fatal("cannot get ftest statuses: test data statuses must have names")
+ }
+ _, reqInf, err := TOSession.GetStatusByName(*status.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, status := range testData.Statuses {
+ if status.Name == nil {
+ t.Fatal("cannot get ftest statuses: test data statuses must have names")
+ }
+ _, reqInf, err := TOSession.GetStatusByName(*status.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestStatusesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ for _, status := range testData.Statuses {
+ if status.Name == nil {
+ t.Fatal("cannot get ftest statuses: test data statuses must have names")
+ }
+ _, reqInf, err := TOSession.GetStatusByName(*status.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestStatuses(t *testing.T) {
for _, status := range testData.Statuses {
@@ -48,7 +109,7 @@ func UpdateTestStatuses(t *testing.T) {
}
// Retrieve the Status by name so we can get the id for the Update
- resp, _, err := TOSession.GetStatusByName(*firstStatus.Name)
+ resp, _, err := TOSession.GetStatusByName(*firstStatus.Name, nil)
if err != nil {
t.Errorf("cannot GET Status by name: %v - %v", firstStatus.Name, err)
}
@@ -62,7 +123,7 @@ func UpdateTestStatuses(t *testing.T) {
}
// Retrieve the Status to check Status name got updated
- resp, _, err = TOSession.GetStatusByID(remoteStatus.ID)
+ resp, _, err = TOSession.GetStatusByID(remoteStatus.ID, nil)
if err != nil {
t.Errorf("cannot GET Status by ID: %v - %v", firstStatus.Description, err)
}
@@ -79,7 +140,7 @@ func GetTestStatuses(t *testing.T) {
if status.Name == nil {
t.Fatal("cannot get ftest statuses: test data statuses must have names")
}
- resp, _, err := TOSession.GetStatusByName(*status.Name)
+ resp, _, err := TOSession.GetStatusByName(*status.Name, nil)
if err != nil {
t.Errorf("cannot GET Status by name: %v - %v", err, resp)
}
@@ -94,7 +155,7 @@ func DeleteTestStatuses(t *testing.T) {
}
// Retrieve the Status by name so we can get the id for the Update
- resp, _, err := TOSession.GetStatusByName(*status.Name)
+ resp, _, err := TOSession.GetStatusByName(*status.Name, nil)
if err != nil {
t.Errorf("cannot GET Status by name: %v - %v", status.Name, err)
}
@@ -106,7 +167,7 @@ func DeleteTestStatuses(t *testing.T) {
}
// Retrieve the Status to see if it got deleted
- types, _, err := TOSession.GetStatusByName(*status.Name)
+ types, _, err := TOSession.GetStatusByName(*status.Name, nil)
if err != nil {
t.Errorf("error deleting Status name: %s", err.Error())
}
diff --git a/traffic_ops/testing/api/v3/steering_test.go b/traffic_ops/testing/api/v3/steering_test.go
index 2baefee..7f6c47d 100644
--- a/traffic_ops/testing/api/v3/steering_test.go
+++ b/traffic_ops/testing/api/v3/steering_test.go
@@ -34,7 +34,7 @@ func GetTestSteering(t *testing.T) {
t.Error("get steering: test data missing ds")
}
- steerings, _, err := TOSession.Steering()
+ steerings, _, err := TOSession.Steering(nil)
if err != nil {
t.Errorf("steering get: getting steering: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/steeringtargets_test.go b/traffic_ops/testing/api/v3/steeringtargets_test.go
index 06c40e2..1eca59d 100644
--- a/traffic_ops/testing/api/v3/steeringtargets_test.go
+++ b/traffic_ops/testing/api/v3/steeringtargets_test.go
@@ -16,6 +16,8 @@ package v3
*/
import (
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
"time"
@@ -28,12 +30,69 @@ var SteeringUserSession *client.Session
func TestSteeringTargets(t *testing.T) {
WithObjs(t, []TCObj{CDNs, Types, Tenants, Parameters, Profiles, Statuses, Divisions, Regions, PhysLocations, CacheGroups, Servers, Topologies, DeliveryServices, Users, SteeringTargets}, func() {
+ GetTestSteeringTargetsIMS(t)
GetTestSteeringTargets(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestSteeringTargets(t)
+ GetTestSteeringTargetsIMSAfterChange(t, header)
})
}
+func GetTestSteeringTargetsIMSAfterChange(t *testing.T, header http.Header) {
+ if len(testData.SteeringTargets) < 1 {
+ t.Fatal("updating steering target: no steering target test data")
+ }
+ st := testData.SteeringTargets[0]
+ if st.DeliveryService == nil {
+ t.Fatal("updating steering target: test data missing ds")
+ }
+ _, reqInf, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ _, reqInf, err = SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
+func GetTestSteeringTargetsIMS(t *testing.T) {
+ if len(testData.SteeringTargets) < 1 {
+ t.Fatal("updating steering target: no steering target test data")
+ }
+ st := testData.SteeringTargets[0]
+ if st.DeliveryService == nil {
+ t.Fatal("updating steering target: test data missing ds")
+ }
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
// SetupSteeringTargets calls the CreateSteeringTargets test. It also sets the steering user session
// with the logged in steering user. SteeringUserSession is used by steering target test functions.
// Running this function depends on CreateTestUsers.
@@ -61,7 +120,7 @@ func CreateTestSteeringTargets(t *testing.T) {
}
{
- respTypes, _, err := SteeringUserSession.GetTypeByName(*st.Type)
+ respTypes, _, err := SteeringUserSession.GetTypeByName(*st.Type, nil)
if err != nil {
t.Fatalf("creating steering target: getting type: %v", err)
} else if len(respTypes) < 1 {
@@ -70,7 +129,7 @@ func CreateTestSteeringTargets(t *testing.T) {
st.TypeID = util.IntPtr(respTypes[0].ID)
}
{
- respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService))
+ respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), nil)
if err != nil {
t.Fatalf("creating steering target: getting ds: %v", err)
} else if len(respDS) < 1 {
@@ -82,7 +141,7 @@ func CreateTestSteeringTargets(t *testing.T) {
st.DeliveryServiceID = &dsID
}
{
- respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.Target))
+ respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.Target), nil)
if err != nil {
t.Fatalf("creating steering target: getting target ds: %v", err)
} else if len(respTarget) < 1 {
@@ -114,7 +173,7 @@ func UpdateTestSteeringTargets(t *testing.T) {
t.Fatal("updating steering target: test data missing target")
}
- respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService))
+ respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), nil)
if err != nil {
t.Fatalf("updating steering target: getting ds: %v", err)
}
@@ -201,7 +260,7 @@ func GetTestSteeringTargets(t *testing.T) {
t.Fatal("updating steering target: test data missing ds")
}
- respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService))
+ respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), nil)
if err != nil {
t.Fatalf("creating steering target: getting ds: %v", err)
} else if len(respDS) < 1 {
@@ -260,7 +319,7 @@ func DeleteTestSteeringTargets(t *testing.T) {
t.Fatal("deleting steering target: test data missing target")
}
- respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService))
+ respDS, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.DeliveryService), nil)
if err != nil {
t.Fatalf("deleting steering target: getting ds: %v", err)
} else if len(respDS) < 1 {
@@ -273,7 +332,7 @@ func DeleteTestSteeringTargets(t *testing.T) {
dsIDs = append(dsIDs, dsID)
- respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.Target))
+ respTarget, _, err := SteeringUserSession.GetDeliveryServiceByXMLIDNullable(string(*st.Target), nil)
if err != nil {
t.Fatalf("deleting steering target: getting target ds: %v", err)
} else if len(respTarget) < 1 {
diff --git a/traffic_ops/testing/api/v3/tenants_test.go b/traffic_ops/testing/api/v3/tenants_test.go
index 33d8666..d575afe 100644
--- a/traffic_ops/testing/api/v3/tenants_test.go
+++ b/traffic_ops/testing/api/v3/tenants_test.go
@@ -52,7 +52,7 @@ func CreateTestTenants(t *testing.T) {
}
func GetTestTenants(t *testing.T) {
- resp, _, err := TOSession.Tenants()
+ resp, _, err := TOSession.Tenants(nil)
if err != nil {
t.Errorf("cannot GET all tenants: %v - %v", err, resp)
return
@@ -83,12 +83,12 @@ func UpdateTestTenants(t *testing.T) {
// Retrieve the Tenant by name so we can get the id for the Update
name := "tenant2"
parentName := "tenant1"
- modTenant, _, err := TOSession.TenantByName(name)
+ modTenant, _, err := TOSession.TenantByName(name, nil)
if err != nil {
t.Errorf("cannot GET Tenant by name: %s - %v", name, err)
}
- newParent, _, err := TOSession.TenantByName(parentName)
+ newParent, _, err := TOSession.TenantByName(parentName, nil)
if err != nil {
t.Errorf("cannot GET Tenant by name: %s - %v", parentName, err)
}
@@ -100,7 +100,7 @@ func UpdateTestTenants(t *testing.T) {
}
// Retrieve the Tenant to check Tenant parent name got updated
- respTenant, _, err := TOSession.Tenant(strconv.Itoa(modTenant.ID))
+ respTenant, _, err := TOSession.Tenant(strconv.Itoa(modTenant.ID), nil)
if err != nil {
t.Errorf("cannot GET Tenant by name: %v - %v", name, err)
}
@@ -113,7 +113,7 @@ func UpdateTestTenants(t *testing.T) {
func DeleteTestTenants(t *testing.T) {
t1 := "tenant1"
- tenant1, _, err := TOSession.TenantByName(t1)
+ tenant1, _, err := TOSession.TenantByName(t1, nil)
if err != nil {
t.Errorf("cannot GET Tenant by name: %v - %v", t1, err)
@@ -147,7 +147,7 @@ func DeleteTestTenants(t *testing.T) {
continue
}
- toTenant, _, err := TOSession.TenantByName(tn.Name)
+ toTenant, _, err := TOSession.TenantByName(tn.Name, nil)
if err != nil {
t.Fatalf("getting tenant %s: %v", tn.Name, err)
}
@@ -174,7 +174,7 @@ func ExtractXMLID(ds *tc.DeliveryServiceNullable) string {
}
func UpdateTestTenantsActive(t *testing.T) {
- originalTenants, _, err := TOSession.Tenants()
+ originalTenants, _, err := TOSession.Tenants(nil)
if err != nil {
t.Fatalf("getting tenants error expected: nil, actual: %+v", err)
}
@@ -184,7 +184,7 @@ func UpdateTestTenantsActive(t *testing.T) {
setTenantActive(t, "tenant3", false)
// ds3 has tenant3. Even though tenant3 is inactive, we should still be able to get it, because our user is tenant1, which is active.
- dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds3")
+ dses, _, err := TOSession.GetDeliveryServiceByXMLIDNullable("ds3", nil)
if err != nil {
t.Fatal("failed to get delivery service, when the DS's tenant was inactive (even though our user's tenant was active)")
} else if len(dses) != 1 {
@@ -196,7 +196,7 @@ func UpdateTestTenantsActive(t *testing.T) {
setTenantActive(t, "tenant3", true)
// ds3 has tenant3. Even though tenant3's parent, tenant2, is inactive, we should still be able to get it, because our user is tenant1, which is active.
- _, _, err = TOSession.GetDeliveryServiceByXMLIDNullable("ds3")
+ _, _, err = TOSession.GetDeliveryServiceByXMLIDNullable("ds3", nil)
if err != nil {
t.Fatal("failed to get delivery service, when a parent tenant was inactive (even though our user's tenant was active)")
}
@@ -213,7 +213,7 @@ func UpdateTestTenantsActive(t *testing.T) {
}
// tenant3user with tenant3 has no access to ds3 with tenant3 when parent tenant2 is inactive
- dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3")
+ dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3", nil)
for _, ds := range dses {
t.Errorf("tenant3user got delivery service %+v with tenant3 but tenant3 parent tenant2 is inactive, expected: no ds", ExtractXMLID(&ds))
}
@@ -223,7 +223,7 @@ func UpdateTestTenantsActive(t *testing.T) {
setTenantActive(t, "tenant3", false)
// tenant3user with tenant3 has no access to ds3 with tenant3 when tenant3 is inactive
- dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3")
+ dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3", nil)
for _, ds := range dses {
t.Errorf("tenant3user got delivery service %+v with tenant3 but tenant3 is inactive, expected: no ds", ExtractXMLID(&ds))
}
@@ -233,7 +233,7 @@ func UpdateTestTenantsActive(t *testing.T) {
setTenantActive(t, "tenant3", true)
// tenant3user with tenant3 has access to ds3 with tenant3
- dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3")
+ dses, _, err = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3", nil)
if err != nil {
t.Errorf("tenant3user getting delivery service ds3 error expected: nil, actual: %+v", err)
} else if len(dses) == 0 {
@@ -244,7 +244,7 @@ func UpdateTestTenantsActive(t *testing.T) {
// 2. tenant3user has tenant3.
// 3. tenant2 is not a child of tenant3 (tenant3 is a child of tenant2)
// 4. Therefore, tenant3user should not have access to ds2
- dses, _, _ = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds2")
+ dses, _, _ = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds2", nil)
for _, ds := range dses {
t.Errorf("tenant3user got delivery service %+v with tenant2, expected: no ds", ExtractXMLID(&ds))
}
@@ -253,13 +253,13 @@ func UpdateTestTenantsActive(t *testing.T) {
// 2. tenant4user has tenant4.
// 3. tenant1 is not a child of tenant4 (tenant4 is unrelated to tenant1)
// 4. Therefore, tenant4user should not have access to ds1
- dses, _, _ = tenant4Session.GetDeliveryServiceByXMLIDNullable("ds1")
+ dses, _, _ = tenant4Session.GetDeliveryServiceByXMLIDNullable("ds1", nil)
for _, ds := range dses {
t.Errorf("tenant4user got delivery service %+v with tenant1, expected: no ds", ExtractXMLID(&ds))
}
setTenantActive(t, "tenant3", false)
- dses, _, _ = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3")
+ dses, _, _ = tenant3Session.GetDeliveryServiceByXMLIDNullable("ds3", nil)
for _, ds := range dses {
t.Errorf("tenant3user was inactive, but got delivery service %+v with tenant3, expected: no ds", ExtractXMLID(&ds))
}
@@ -275,7 +275,7 @@ func UpdateTestTenantsActive(t *testing.T) {
}
func setTenantActive(t *testing.T, name string, active bool) {
- tn, _, err := TOSession.TenantByName(name)
+ tn, _, err := TOSession.TenantByName(name, nil)
if err != nil {
t.Fatalf("cannot GET Tenant by name: %s - %v", name, err)
}
diff --git a/traffic_ops/testing/api/v3/topologies_test.go b/traffic_ops/testing/api/v3/topologies_test.go
index 7584415..75c4ecf 100644
--- a/traffic_ops/testing/api/v3/topologies_test.go
+++ b/traffic_ops/testing/api/v3/topologies_test.go
@@ -21,11 +21,10 @@ package v3
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-tc"
"reflect"
"strings"
"testing"
-
- "github.com/apache/trafficcontrol/lib/go-tc"
)
type topologyTestCase struct {
@@ -192,7 +191,7 @@ func DeleteTestTopologies(t *testing.T) {
t.Errorf("topology deletion audit log entry - expected: message containing topology name '%s', actual: %s", top.Name, *deleteLog[0].Message)
}
- topology, _, err := TOSession.GetTopology(top.Name)
+ topology, _, err := TOSession.GetTopology(top.Name, nil)
if err == nil {
t.Fatalf("expected error trying to GET deleted topology: %s, actual: nil", top.Name)
}
diff --git a/traffic_ops/testing/api/v3/traffic_ops_test.go b/traffic_ops/testing/api/v3/traffic_ops_test.go
index 2dce61b..5412de3 100644
--- a/traffic_ops/testing/api/v3/traffic_ops_test.go
+++ b/traffic_ops/testing/api/v3/traffic_ops_test.go
@@ -76,7 +76,8 @@ func TestMain(m *testing.M) {
DB Server: %s
DB User: %s
DB Name: %s
- DB Ssl: %t`, *configFileName, *tcFixturesFileName, Config.TrafficOps.URL, Config.Default.Session.TimeoutInSecs, Config.TrafficOpsDB.Hostname, Config.TrafficOpsDB.User, Config.TrafficOpsDB.Name, Config.TrafficOpsDB.SSL)
+ DB Ssl: %t
+ UseIMS: %v`, *configFileName, *tcFixturesFileName, Config.TrafficOps.URL, Config.Default.Session.TimeoutInSecs, Config.TrafficOpsDB.Hostname, Config.TrafficOpsDB.User, Config.TrafficOpsDB.Name, Config.TrafficOpsDB.SSL, Config.UseIMS)
//Load the test data
LoadFixtures(*tcFixturesFileName)
diff --git a/traffic_ops/testing/api/v3/types_test.go b/traffic_ops/testing/api/v3/types_test.go
index 5659c58..b6679ec 100644
--- a/traffic_ops/testing/api/v3/types_test.go
+++ b/traffic_ops/testing/api/v3/types_test.go
@@ -17,18 +17,72 @@ package v3
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ "net/http"
"testing"
+ "time"
tc "github.com/apache/trafficcontrol/lib/go-tc"
)
func TestTypes(t *testing.T) {
WithObjs(t, []TCObj{Parameters, Types}, func() {
+ GetTestTypesIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestTypes(t)
GetTestTypes(t)
+ GetTestTypesIMSAfterChange(t, header)
})
}
+func GetTestTypesIMSAfterChange(t *testing.T, header http.Header) {
+ for _, typ := range testData.Types {
+ _, reqInf, err := TOSession.GetTypeByName(typ.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ for _, typ := range testData.Types {
+ _, reqInf, err := TOSession.GetTypeByName(typ.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
+func GetTestTypesIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ t.Log("---- GetTestTypes ----")
+
+ for _, typ := range testData.Types {
+ _, reqInf, err := TOSession.GetTypeByName(typ.Name, header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+ }
+}
+
func CreateTestTypes(t *testing.T) {
t.Log("---- CreateTestTypes ----")
@@ -45,7 +99,7 @@ func CreateTestTypes(t *testing.T) {
dbQueryTemplate := "INSERT INTO type (name, description, use_in_table) VALUES ('%v', '%v', '%v');"
for _, typ := range testData.Types {
- foundTypes, _, err := TOSession.GetTypeByName(typ.Name)
+ foundTypes, _, err := TOSession.GetTypeByName(typ.Name, nil)
if err == nil && len(foundTypes) > 0 {
t.Logf("Type %v already exists (%v match(es))", typ.Name, len(foundTypes))
continue
@@ -69,7 +123,7 @@ func UpdateTestTypes(t *testing.T) {
for i, typ := range testData.Types {
expectedTypeName := fmt.Sprintf("testType%v", i)
originalType := typ
- resp, _, err := TOSession.GetTypeByName(originalType.Name)
+ resp, _, err := TOSession.GetTypeByName(originalType.Name, nil)
if err != nil {
t.Fatalf("cannot GET Type by name: %v - %v", originalType.Name, err)
}
@@ -94,7 +148,7 @@ func UpdateTestTypes(t *testing.T) {
}
// Retrieve the Type to check Type name got updated
- resp, _, err = TOSession.GetTypeByID(remoteType.ID)
+ resp, _, err = TOSession.GetTypeByID(remoteType.ID, nil)
if err != nil {
t.Fatalf("cannot GET Type by ID: %v - %v", originalType.ID, err)
}
@@ -119,7 +173,7 @@ func GetTestTypes(t *testing.T) {
t.Log("---- GetTestTypes ----")
for _, typ := range testData.Types {
- resp, _, err := TOSession.GetTypeByName(typ.Name)
+ resp, _, err := TOSession.GetTypeByName(typ.Name, nil)
if err != nil {
t.Errorf("cannot GET Type by name: %v - %v", err, resp)
@@ -146,7 +200,7 @@ func DeleteTestTypes(t *testing.T) {
for _, typ := range testData.Types {
// Retrieve the Type by name so we can get the id for the Update
- resp, _, err := TOSession.GetTypeByName(typ.Name)
+ resp, _, err := TOSession.GetTypeByName(typ.Name, nil)
if err != nil || len(resp) == 0 {
t.Fatalf("cannot GET Type by name: %v - %v", typ.Name, err)
}
@@ -165,7 +219,7 @@ func DeleteTestTypes(t *testing.T) {
}
// Retrieve the Type to see if it got deleted
- types, _, err := TOSession.GetTypeByName(typ.Name)
+ types, _, err := TOSession.GetTypeByName(typ.Name, nil)
if err != nil {
t.Errorf("error deleting Type name: %v", err)
}
diff --git a/traffic_ops/testing/api/v3/user_test.go b/traffic_ops/testing/api/v3/user_test.go
index 38a8ff7..9e9c4b2 100644
--- a/traffic_ops/testing/api/v3/user_test.go
+++ b/traffic_ops/testing/api/v3/user_test.go
@@ -31,7 +31,14 @@ import (
func TestUsers(t *testing.T) {
WithObjs(t, []TCObj{Tenants, Parameters, Users}, func() {
+ GetTestUsersIMS(t)
+ currentTime := time.Now().Add(-1 * time.Second)
+ time := currentTime.Format(time.RFC1123)
+ var header http.Header
+ header = make(map[string][]string)
+ header.Set(rfc.IfModifiedSince, time)
UpdateTestUsers(t)
+ GetTestUsersIMSAfterChange(t, header)
RolenameCapitalizationTest(t)
OpsUpdateAdminTest(t)
UserSelfUpdateTest(t)
@@ -46,8 +53,44 @@ func TestUsers(t *testing.T) {
})
}
+func GetTestUsersIMSAfterChange(t *testing.T, header http.Header) {
+ _, reqInf, err := TOSession.GetUsers(header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusOK {
+ t.Fatalf("Expected 200 status code, got %v", reqInf.StatusCode)
+ }
+ currentTime := time.Now()
+ currentTime = currentTime.Add(1 * time.Second)
+ timeStr := currentTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, timeStr)
+ _, reqInf, err = TOSession.GetUsers(header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
const SessionUserName = "admin" // TODO make dynamic?
+func GetTestUsersIMS(t *testing.T) {
+ var header http.Header
+ header = make(map[string][]string)
+ futureTime := time.Now().AddDate(0,0,1)
+ time := futureTime.Format(time.RFC1123)
+ header.Set(rfc.IfModifiedSince, time)
+ _, reqInf, err := TOSession.GetUsers(header)
+ if err != nil {
+ t.Fatalf("Expected no error, but got %v", err.Error())
+ }
+ if reqInf.StatusCode != http.StatusNotModified {
+ t.Fatalf("Expected 304 status code, got %v", reqInf.StatusCode)
+ }
+}
+
func CreateTestUsers(t *testing.T) {
for _, user := range testData.Users {
@@ -61,7 +104,7 @@ func CreateTestUsers(t *testing.T) {
func RolenameCapitalizationTest(t *testing.T) {
- roles, _, _, err := TOSession.GetRoles()
+ roles, _, _, err := TOSession.GetRoles(nil)
if err != nil {
t.Errorf("could not get roles: %v", err)
}
@@ -69,7 +112,7 @@ func RolenameCapitalizationTest(t *testing.T) {
t.Fatal("there should be at least one role to test the user")
}
- tenants, _, err := TOSession.Tenants()
+ tenants, _, err := TOSession.Tenants(nil)
if err != nil {
t.Errorf("could not get tenants: %v", err)
}
@@ -125,7 +168,7 @@ func OpsUpdateAdminTest(t *testing.T) {
t.Fatalf("failed to get log in with opsuser: %v", err.Error())
}
- resp, _, err := TOSession.GetUserByUsername("admin")
+ resp, _, err := TOSession.GetUserByUsername("admin", nil)
if err != nil {
t.Errorf("cannot GET user by name: 'admin', %v", err)
}
@@ -146,7 +189,7 @@ func UserRegistrationTest(t *testing.T) {
ForceDeleteTestUsers(t)
var emails []string
for _, user := range testData.Users {
- tenant, _, err := TOSession.TenantByName(*user.Tenant)
+ tenant, _, err := TOSession.TenantByName(*user.Tenant, nil)
if err != nil {
t.Fatalf("could not get tenant %v: %v", *user.Tenant, err)
}
@@ -176,7 +219,7 @@ func UserSelfUpdateTest(t *testing.T) {
t.Fatalf("failed to get log in with opsuser: %v", err.Error())
}
- resp, _, err := TOSession.GetUserByUsername("opsuser")
+ resp, _, err := TOSession.GetUserByUsername("opsuser", nil)
if err != nil {
t.Fatalf("cannot GET user by name: 'opsuser', %v\n", err)
}
@@ -199,7 +242,7 @@ func UserSelfUpdateTest(t *testing.T) {
}
// Make sure it got updated
- resp2, _, err := TOSession.GetUserByID(*user.ID)
+ resp2, _, err := TOSession.GetUserByID(*user.ID, nil)
if err != nil {
t.Fatalf("cannot GET user by id: '%d', %v\n", *user.ID, err)
}
@@ -229,7 +272,7 @@ func UserSelfUpdateTest(t *testing.T) {
}
// Make sure it got updated
- resp2, _, err = TOSession.GetUserByID(*user.ID)
+ resp2, _, err = TOSession.GetUserByID(*user.ID, nil)
if err != nil {
t.Fatalf("error getting user #%d: %v", *user.ID, err)
}
@@ -259,7 +302,7 @@ func UserSelfUpdateTest(t *testing.T) {
}
// Ensure it wasn't actually updated
- resp2, _, err = TOSession.GetUserByID(*user.ID)
+ resp2, _, err = TOSession.GetUserByID(*user.ID, nil)
if err != nil {
t.Fatalf("error getting user #%d: %v", *user.ID, err)
}
@@ -276,7 +319,7 @@ func UserSelfUpdateTest(t *testing.T) {
}
func UserUpdateOwnRoleTest(t *testing.T) {
- resp, _, err := TOSession.GetUserByUsername(SessionUserName)
+ resp, _, err := TOSession.GetUserByUsername(SessionUserName, nil)
if err != nil {
t.Errorf("cannot GET user by name: '%s', %v", SessionUserName, err)
}
@@ -291,7 +334,7 @@ func UserUpdateOwnRoleTest(t *testing.T) {
func UpdateTestUsers(t *testing.T) {
firstUsername := *testData.Users[0].Username
- resp, _, err := TOSession.GetUserByUsername(firstUsername)
+ resp, _, err := TOSession.GetUserByUsername(firstUsername, nil)
if err != nil {
t.Errorf("cannot GET user by name: '%s', %v", firstUsername, err)
}
@@ -306,7 +349,7 @@ func UpdateTestUsers(t *testing.T) {
}
// Make sure it got updated
- resp2, _, err := TOSession.GetUserByID(*user.ID)
+ resp2, _, err := TOSession.GetUserByID(*user.ID, nil)
if err != nil {
t.Errorf("cannot GET user by id: '%d', %v", *user.ID, err)
}
@@ -317,14 +360,14 @@ func UpdateTestUsers(t *testing.T) {
}
func GetTestUsers(t *testing.T) {
- _, _, err := TOSession.GetUsers()
+ _, _, err := TOSession.GetUsers(nil)
if err != nil {
t.Errorf("cannot GET users: %v", err)
}
}
func GetTestUserCurrent(t *testing.T) {
- user, _, err := TOSession.GetUserCurrent()
+ user, _, err := TOSession.GetUserCurrent(nil)
if err != nil {
t.Errorf("cannot GET current user: %v", err)
}
@@ -337,7 +380,7 @@ func GetTestUserCurrent(t *testing.T) {
}
func UserTenancyTest(t *testing.T) {
- users, _, err := TOSession.GetUsers()
+ users, _, err := TOSession.GetUsers(nil)
if err != nil {
t.Errorf("cannot GET users: %v", err)
}
@@ -369,7 +412,7 @@ func UserTenancyTest(t *testing.T) {
t.Fatalf("failed to log in with tenant4user: %v", err.Error())
}
- usersReadableByTenant4, _, err := tenant4TOClient.GetUsers()
+ usersReadableByTenant4, _, err := tenant4TOClient.GetUsers(nil)
if err != nil {
t.Error("tenant4user cannot GET users")
}
@@ -395,7 +438,7 @@ func UserTenancyTest(t *testing.T) {
}
// assert that tenant4user cannot create a user outside of its tenant
- rootTenant, _, err := TOSession.TenantByName("root")
+ rootTenant, _, err := TOSession.TenantByName("root", nil)
if err != nil {
t.Error("expected to be able to GET the root tenant")
}
@@ -442,7 +485,7 @@ func ForceDeleteTestUsers(t *testing.T) {
func DeleteTestUsers(t *testing.T) {
for _, user := range testData.Users {
- resp, _, err := TOSession.GetUserByUsername(*user.Username)
+ resp, _, err := TOSession.GetUserByUsername(*user.Username, nil)
if err != nil {
t.Errorf("cannot GET user by name: %v - %v", *user.Username, err)
}
@@ -456,7 +499,7 @@ func DeleteTestUsers(t *testing.T) {
}
// Make sure it got deleted
- resp, _, err := TOSession.GetUserByUsername(*user.Username)
+ resp, _, err := TOSession.GetUserByUsername(*user.Username, nil)
if err != nil {
t.Errorf("error deleting user by name: %s", err.Error())
}
diff --git a/traffic_ops/traffic_ops_golang/api/generic_crud.go b/traffic_ops/traffic_ops_golang/api/generic_crud.go
index 8150d00..fd86d32 100644
--- a/traffic_ops/traffic_ops_golang/api/generic_crud.go
+++ b/traffic_ops/traffic_ops_golang/api/generic_crud.go
@@ -20,9 +20,15 @@ package api
*/
import (
+ "database/sql"
"errors"
"fmt"
+ "github.com/apache/trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+ ims "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims"
"net/http"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-util"
@@ -43,6 +49,7 @@ type GenericReader interface {
ParamColumns() map[string]dbhelpers.WhereColumnInfo
NewReadObj() interface{}
SelectQuery() string
+ SelectMaxLastUpdatedQuery(where string, orderBy string, pagination string, tableName string) string
}
type GenericUpdater interface {
@@ -118,28 +125,92 @@ func GenericCreateNameBasedID(val GenericCreator) (error, error, int) {
return nil, nil, http.StatusOK
}
-func GenericRead(val GenericReader) ([]interface{}, error, error, int) {
+// TryIfModifiedSinceQuery checks to see the max time that an entity was changed, and then returns a boolean (which tells us whether or not to run the main query for the endpoint)
+// along with the max time
+// If the returned boolean is false, there is no need to run the main query for the GET API endpoint, and we return a 304 status
+func TryIfModifiedSinceQuery(val GenericReader, h http.Header, where string, orderBy string, pagination string, queryValues map[string]interface{}) (bool, time.Time) {
+ var max time.Time
+ var imsDate time.Time
+ var ok bool
+ imsDateHeader := []string{}
+ runSecond := true
+ dontRunSecond := false
+ if h == nil {
+ return runSecond, max
+ }
+ imsDateHeader = h[rfc.IfModifiedSince]
+ if len(imsDateHeader) == 0 {
+ return runSecond, max
+ }
+ if imsDate, ok = web.ParseHTTPDate(imsDateHeader[0]); !ok {
+ log.Warnf("IMS request header date '%s' not parsable", imsDateHeader[0])
+ return runSecond, max
+ }
+ // ToDo: Remove orderBy, pagination from all the implementations, and eventually remove it from the function definition
+ query := val.SelectMaxLastUpdatedQuery(where, "", "", val.GetType())
+ rows, err := val.APIInfo().Tx.NamedQuery(query, queryValues)
+ if err != nil {
+ log.Warnf("Couldn't get the max last updated time: %v", err)
+ return runSecond, max
+ }
+ if err == sql.ErrNoRows {
+ return dontRunSecond, max
+ }
+ defer rows.Close()
+ // This should only ever contain one row
+ if rows.Next() {
+ v := &ims.LatestTimestamp{}
+ if err = rows.StructScan(v); err != nil || v == nil {
+ log.Warnf("Failed to parse the max time stamp into a struct %v", err)
+ return runSecond, max
+ }
+ if v.LatestTime != nil {
+ max = v.LatestTime.Time
+ // The request IMS time is later than the max of (lastUpdated, deleted_time)
+ if imsDate.After(v.LatestTime.Time) {
+ return dontRunSecond, max
+ }
+ }
+ }
+ return runSecond, max
+}
+
+func GenericRead(h http.Header, val GenericReader, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
+ vals := []interface{}{}
+ code := http.StatusOK
+ var maxTime time.Time
+ var runSecond bool
where, orderBy, pagination, queryValues, errs := dbhelpers.BuildWhereAndOrderByAndPagination(val.APIInfo().Params, val.ParamColumns())
if len(errs) > 0 {
- return nil, util.JoinErrs(errs), nil, http.StatusBadRequest
+ return nil, util.JoinErrs(errs), nil, http.StatusBadRequest, nil
}
-
+ if useIMS {
+ runSecond, maxTime = TryIfModifiedSinceQuery(val, h, where, orderBy, pagination, queryValues)
+ if !runSecond {
+ log.Debugln("IMS HIT")
+ code = http.StatusNotModified
+ return vals, nil, nil, code, &maxTime
+ }
+ log.Debugln("IMS MISS")
+ } else {
+ log.Debugln("Non IMS request")
+ }
+ // Case where we need to run the second query
query := val.SelectQuery() + where + orderBy + pagination
rows, err := val.APIInfo().Tx.NamedQuery(query, queryValues)
if err != nil {
- return nil, nil, errors.New("querying " + val.GetType() + ": " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("querying " + val.GetType() + ": " + err.Error()), http.StatusInternalServerError, &maxTime
}
defer rows.Close()
- vals := []interface{}{}
for rows.Next() {
v := val.NewReadObj()
if err = rows.StructScan(v); err != nil {
- return nil, nil, errors.New("scanning " + val.GetType() + ": " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("scanning " + val.GetType() + ": " + err.Error()), http.StatusInternalServerError, &maxTime
}
vals = append(vals, v)
}
- return vals, nil, nil, http.StatusOK
+ return vals, nil, nil, code, &maxTime
}
// GenericUpdate handles the common update case, where the update returns the new last_modified time.
diff --git a/traffic_ops/traffic_ops_golang/api/shared_handlers.go b/traffic_ops/traffic_ops_golang/api/shared_handlers.go
index 3a184ca..942db70 100644
--- a/traffic_ops/traffic_ops_golang/api/shared_handlers.go
+++ b/traffic_ops/traffic_ops_golang/api/shared_handlers.go
@@ -25,6 +25,7 @@ import (
"encoding/json"
"errors"
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
"io/ioutil"
"net/http"
"reflect"
@@ -136,6 +137,7 @@ func checkIfOptionsDeleter(obj interface{}, params map[string]string) (bool, err
// marshals the structs returned into the proper response json
func ReadHandler(reader Reader) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
+ useIMS := false
inf, userErr, sysErr, errCode := NewInfo(r, nil, nil)
if userErr != nil || sysErr != nil {
HandleErr(w, r, inf.Tx.Tx, errCode, userErr, sysErr)
@@ -152,11 +154,24 @@ func ReadHandler(reader Reader) http.HandlerFunc {
obj := reflect.New(objectType).Interface().(Reader)
obj.SetInfo(inf)
- results, userErr, sysErr, errCode := obj.Read()
+ cfg, err := GetConfig(r.Context())
+ if err != nil {
+ log.Warnf("Couldnt get the config %v", err)
+ }
+ if cfg != nil {
+ useIMS = cfg.UseIMS
+ }
+ results, userErr, sysErr, errCode, maxTime := obj.Read(r.Header, useIMS)
if userErr != nil || sysErr != nil {
HandleErr(w, r, inf.Tx.Tx, errCode, userErr, sysErr)
return
}
+ if maxTime != nil {
+ // RFC1123
+ date := maxTime.Format("Mon, 02 Jan 2006 15:04:05 MST")
+ w.Header().Add(rfc.LastModified, date)
+ }
+ w.WriteHeader(errCode)
WriteResp(w, r, results)
}
}
@@ -187,7 +202,7 @@ func DeprecatedReadHandler(reader Reader, alternative *string) http.HandlerFunc
obj := reflect.New(objectType).Interface().(Reader)
obj.SetInfo(inf)
- results, userErr, sysErr, errCode := obj.Read()
+ results, userErr, sysErr, errCode, _ := obj.Read(r.Header, false)
if userErr != nil || sysErr != nil {
userErr = LogErr(r, http.StatusInternalServerError, userErr, sysErr)
alerts.AddAlerts(tc.CreateErrorAlerts(userErr))
diff --git a/traffic_ops/traffic_ops_golang/api/shared_handlers_test.go b/traffic_ops/traffic_ops_golang/api/shared_handlers_test.go
index 6cef2fc..260343f 100644
--- a/traffic_ops/traffic_ops_golang/api/shared_handlers_test.go
+++ b/traffic_ops/traffic_ops_golang/api/shared_handlers_test.go
@@ -27,6 +27,7 @@ import (
"strconv"
"strings"
"testing"
+ "time"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/config"
@@ -81,8 +82,8 @@ func (i *tester) Create() (error, error, int) {
}
//Reader interface functions
-func (i *tester) Read() ([]interface{}, error, error, int) {
- return []interface{}{tester{ID: 1}}, nil, nil, http.StatusOK
+func (i *tester) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
+ return []interface{}{tester{ID: 1}}, nil, nil, http.StatusOK, nil
}
//Updater interface functions
diff --git a/traffic_ops/traffic_ops_golang/api/shared_interfaces.go b/traffic_ops/traffic_ops_golang/api/shared_interfaces.go
index 279911f..09a2ca2 100644
--- a/traffic_ops/traffic_ops_golang/api/shared_interfaces.go
+++ b/traffic_ops/traffic_ops_golang/api/shared_interfaces.go
@@ -23,11 +23,13 @@ import (
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/auth"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers"
+ "net/http"
+ "time"
)
type CRUDer interface {
Create() (error, error, int)
- Read() ([]interface{}, error, error, int)
+ Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time)
Update() (error, error, int)
Delete() (error, error, int)
APIInfoer
@@ -72,7 +74,7 @@ type MultipleCreator interface {
type Reader interface {
// Read returns the object to write to the user, any user error, any system error, and the HTTP error code to be returned if there was an error.
- Read() ([]interface{}, error, error, int)
+ Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time)
APIInfoer
}
diff --git a/traffic_ops/traffic_ops_golang/apitenant/tenant.go b/traffic_ops/traffic_ops_golang/apitenant/tenant.go
index 6187c4e..7805b20 100644
--- a/traffic_ops/traffic_ops_golang/apitenant/tenant.go
+++ b/traffic_ops/traffic_ops_golang/apitenant/tenant.go
@@ -25,9 +25,6 @@ import (
"database/sql"
"errors"
"fmt"
- "net/http"
- "strconv"
-
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-tc/tovalidate"
"github.com/apache/trafficcontrol/lib/go-util"
@@ -36,8 +33,10 @@ import (
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant"
validation "github.com/go-ozzo/ozzo-validation"
-
"github.com/lib/pq"
+ "net/http"
+ "strconv"
+ "time"
)
// TOTenant provides a local type against which to define methods
@@ -48,7 +47,13 @@ type TOTenant struct {
func (v *TOTenant) SetLastUpdated(t tc.TimeNoMod) { v.LastUpdated = &t }
func (v *TOTenant) InsertQuery() string { return insertQuery() }
-func (v *TOTenant) NewReadObj() interface{} { return &tc.TenantNullable{} }
+func (v *TOTenant) SelectMaxLastUpdatedQuery(where, orderBy, pagination, tableName string) string {
+ return `SELECT max(t) from (
+ SELECT max(last_updated) as t from ` + tableName + ` q ` + where + orderBy + pagination +
+ ` UNION ALL
+ select max(last_updated) as t from last_deleted l where l.table_name='` + tableName + `') as res`
+}
+func (v *TOTenant) NewReadObj() interface{} { return &tc.TenantNullable{} }
func (v *TOTenant) SelectQuery() string {
return selectQuery(v.APIInfo().User.TenantID)
}
@@ -122,14 +127,14 @@ func (ten TOTenant) Validate() error {
func (tn *TOTenant) Create() (error, error, int) { return api.GenericCreate(tn) }
-func (ten *TOTenant) Read() ([]interface{}, error, error, int) {
+func (ten *TOTenant) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
if ten.APIInfo().User.TenantID == auth.TenantIDInvalid {
- return nil, nil, nil, http.StatusOK
+ return nil, nil, nil, http.StatusOK, nil
}
- tenants, userErr, sysErr, errCode := api.GenericRead(ten)
+ tenants, userErr, sysErr, errCode, maxTime := api.GenericRead(h, ten, useIMS)
if userErr != nil || sysErr != nil {
- return nil, userErr, sysErr, errCode
+ return nil, userErr, sysErr, errCode, nil
}
tenantNames := map[int]*string{}
@@ -146,7 +151,7 @@ func (ten *TOTenant) Read() ([]interface{}, error, error, int) {
p := *tenantNames[*t.ParentID]
t.ParentName = &p // copy
}
- return tenants, nil, nil, http.StatusOK
+ return tenants, nil, nil, errCode, maxTime
}
// IsTenantAuthorized implements the Tenantable interface for TOTenant
diff --git a/traffic_ops/traffic_ops_golang/asn/asns.go b/traffic_ops/traffic_ops_golang/asn/asns.go
index 26bfb26..0b3dbf8 100644
--- a/traffic_ops/traffic_ops_golang/asn/asns.go
+++ b/traffic_ops/traffic_ops_golang/asn/asns.go
@@ -22,6 +22,7 @@ package asn
import (
"net/http"
"strconv"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-tc/tovalidate"
@@ -55,7 +56,6 @@ func (v *TOASNV11) ParamColumns() map[string]dbhelpers.WhereColumnInfo {
}
func (v *TOASNV11) UpdateQuery() string { return updateQuery() }
func (v *TOASNV11) DeleteQuery() string { return deleteQuery() }
-
func (asn TOASNV11) GetKeyFieldsInfo() []api.KeyFieldInfo {
return []api.KeyFieldInfo{{"id", api.GetIntKey}}
}
@@ -98,10 +98,21 @@ func (asn TOASNV11) Validate() error {
return util.JoinErrs(tovalidate.ToErrors(errs))
}
-func (as *TOASNV11) Create() (error, error, int) { return api.GenericCreate(as) }
-func (as *TOASNV11) Read() ([]interface{}, error, error, int) { return api.GenericRead(as) }
-func (as *TOASNV11) Update() (error, error, int) { return api.GenericUpdate(as) }
-func (as *TOASNV11) Delete() (error, error, int) { return api.GenericDelete(as) }
+func (as *TOASNV11) Create() (error, error, int) { return api.GenericCreate(as) }
+func (as *TOASNV11) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
+ return api.GenericRead(h, as, useIMS)
+}
+func (v *TOASNV11) SelectMaxLastUpdatedQuery(where, orderBy, pagination, tableName string) string {
+ return `SELECT max(t) from (
+ SELECT max(a.last_updated) as t from asn a
+JOIN
+ cachegroup c ON a.cachegroup = c.id ` + where + orderBy + pagination +
+ ` UNION ALL
+ select max(last_updated) as t from last_deleted l where l.table_name='asn') as res`
+}
+
+func (as *TOASNV11) Update() (error, error, int) { return api.GenericUpdate(as) }
+func (as *TOASNV11) Delete() (error, error, int) { return api.GenericDelete(as) }
// V11ReadAll implements the asns 1.1 route, which is different from the 1.1 route for a single ASN and from 1.2+ routes, in that it wraps the content in an additional "asns" object.
func V11ReadAll(w http.ResponseWriter, r *http.Request) {
@@ -114,7 +125,7 @@ func V11ReadAll(w http.ResponseWriter, r *http.Request) {
asn := &TOASNV11{}
asn.SetInfo(inf)
- asns, userErr, sysErr, errCode := api.GenericRead(asn)
+ asns, userErr, sysErr, errCode, _ := api.GenericRead(r.Header, asn, false)
if userErr != nil || sysErr != nil {
api.HandleErr(w, r, inf.Tx.Tx, errCode, userErr, sysErr)
return
diff --git a/traffic_ops/traffic_ops_golang/asn/asns_test.go b/traffic_ops/traffic_ops_golang/asn/asns_test.go
index c30d427..304ca45 100644
--- a/traffic_ops/traffic_ops_golang/asn/asns_test.go
+++ b/traffic_ops/traffic_ops_golang/asn/asns_test.go
@@ -87,7 +87,7 @@ func TestGetASNs(t *testing.T) {
api.APIInfoImpl{&reqInfo},
tc.ASNNullable{},
}
- asns, userErr, sysErr, _ := obj.Read()
+ asns, userErr, sysErr, _, _ := obj.Read(nil, false)
if userErr != nil || sysErr != nil {
t.Errorf("Read expected: no errors, actual: %v %v", userErr, sysErr)
}
diff --git a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go
index 87ba34a..f247cc8 100644
--- a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go
+++ b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go
@@ -23,9 +23,11 @@ import (
"database/sql"
"errors"
"fmt"
+ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims"
"net/http"
"strconv"
"strings"
+ "time"
"github.com/apache/trafficcontrol/lib/go-log"
"github.com/apache/trafficcontrol/lib/go-tc"
@@ -424,7 +426,10 @@ func GetCacheGroupsByName(names []string, Tx *sqlx.Tx) (map[string]tc.CacheGroup
return cacheGroupMap, nil, nil, http.StatusOK
}
-func (cg *TOCacheGroup) Read() ([]interface{}, error, error, int) {
+func (cg *TOCacheGroup) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
+ var maxTime time.Time
+ var runSecond bool
+ cacheGroups := []interface{}{}
// Query Parameters to Database Query column mappings
// see the fields mapped in the SQL query
queryParamsToQueryCols := map[string]dbhelpers.WhereColumnInfo{
@@ -436,7 +441,18 @@ func (cg *TOCacheGroup) Read() ([]interface{}, error, error, int) {
}
where, orderBy, pagination, queryValues, errs := dbhelpers.BuildWhereAndOrderByAndPagination(cg.ReqInfo.Params, queryParamsToQueryCols)
if len(errs) > 0 {
- return nil, util.JoinErrs(errs), nil, http.StatusBadRequest
+ return nil, util.JoinErrs(errs), nil, http.StatusBadRequest, nil
+ }
+
+ if useIMS {
+ runSecond, maxTime = ims.TryIfModifiedSinceQuery(cg.APIInfo().Tx, h, queryValues, selectMaxLastUpdatedQuery(where))
+ if !runSecond {
+ log.Debugln("IMS HIT")
+ return cacheGroups, nil, nil, http.StatusNotModified, &maxTime
+ }
+ log.Debugln("IMS MISS")
+ } else {
+ log.Debugln("Non IMS request")
}
baseSelect := SelectQuery()
if _, ok := cg.ReqInfo.Params["topology"]; ok {
@@ -448,17 +464,16 @@ LEFT JOIN topology_cachegroup ON cachegroup.name = topology_cachegroup.cachegrou
if cgType, ok := cg.ReqInfo.Params["type"]; ok {
_, err := strconv.Atoi(cgType)
if err != nil {
- return nil, errors.New("cachegroup read: converting cachegroup type to integer " + err.Error()), nil, http.StatusBadRequest
+ return nil, errors.New("cachegroup read: converting cachegroup type to integer " + err.Error()), nil, http.StatusBadRequest, nil
}
}
query := baseSelect + where + orderBy + pagination
rows, err := cg.ReqInfo.Tx.NamedQuery(query, queryValues)
if err != nil {
- return nil, nil, errors.New("cachegroup read: querying: " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("cachegroup read: querying: " + err.Error()), http.StatusInternalServerError, nil
}
defer rows.Close()
- cacheGroups := []interface{}{}
for rows.Next() {
var s TOCacheGroup
lms := make([]tc.LocalizationMethod, 0)
@@ -480,14 +495,24 @@ LEFT JOIN topology_cachegroup ON cachegroup.name = topology_cachegroup.cachegrou
pq.Array(&cgfs),
&s.FallbackToClosest,
); err != nil {
- return nil, nil, errors.New("cachegroup read: scanning: " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("cachegroup read: scanning: " + err.Error()), http.StatusInternalServerError, nil
}
s.LocalizationMethods = &lms
s.Fallbacks = &cgfs
cacheGroups = append(cacheGroups, s)
}
+ return cacheGroups, nil, nil, http.StatusOK, &maxTime
+}
- return cacheGroups, nil, nil, http.StatusOK
+func selectMaxLastUpdatedQuery(where string) string {
+ return `SELECT max(t) from (
+ SELECT max(cachegroup.last_updated) as t FROM cachegroup
+LEFT JOIN coordinate ON coordinate.id = cachegroup.coordinate
+INNER JOIN type ON cachegroup.type = type.id
+LEFT JOIN cachegroup AS cgp ON cachegroup.parent_cachegroup_id = cgp.id
+LEFT JOIN cachegroup AS cgs ON cachegroup.secondary_parent_cachegroup_id = cgs.id ` + where +
+ ` UNION ALL
+ select max(last_updated) as t from last_deleted l where l.table_name='cachegroup') as res`
}
//The TOCacheGroup implementation of the Updater interface
diff --git a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups_test.go b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups_test.go
index baa7847..24ab463 100644
--- a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups_test.go
+++ b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups_test.go
@@ -142,7 +142,7 @@ func TestReadCacheGroups(t *testing.T) {
api.APIInfoImpl{&reqInfo},
tc.CacheGroupNullable{},
}
- cachegroups, userErr, sysErr, _ := obj.Read()
+ cachegroups, userErr, sysErr, _, _ := obj.Read(nil, false)
if userErr != nil || sysErr != nil {
t.Errorf("Read expected: no errors, actual: %v %v", userErr, sysErr)
@@ -332,7 +332,7 @@ func TestBadTypeParamCacheGroups(t *testing.T) {
api.APIInfoImpl{&reqInfo},
tc.CacheGroupNullable{},
}
- _, userErr, _, sc := obj.Read()
+ _, userErr, _, sc, _ := obj.Read(nil, false)
if sc != http.StatusBadRequest {
t.Errorf("Read expected status code: Bad Request, actual: %v ", sc)
}
diff --git a/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters.go b/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters.go
index a1dddac..05739bb 100644
--- a/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters.go
+++ b/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters.go
@@ -24,10 +24,13 @@ import (
"encoding/json"
"errors"
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims"
"io/ioutil"
"net/http"
"strconv"
"strings"
+ "time"
"github.com/jmoiron/sqlx"
@@ -63,38 +66,50 @@ func (cgparam *TOCacheGroupParameter) GetType() string {
return "cachegroup parameter"
}
-func (cgparam *TOCacheGroupParameter) Read() ([]interface{}, error, error, int) {
+func (cgparam *TOCacheGroupParameter) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
+ var maxTime time.Time
+ var runSecond bool
queryParamsToQueryCols := cgparam.ParamColumns()
parameters := cgparam.APIInfo().Params
where, orderBy, pagination, queryValues, errs := dbhelpers.BuildWhereAndOrderByAndPagination(parameters, queryParamsToQueryCols)
if len(errs) > 0 {
- return nil, util.JoinErrs(errs), nil, http.StatusBadRequest
+ return nil, util.JoinErrs(errs), nil, http.StatusBadRequest, nil
}
-
cgID, err := strconv.Atoi(parameters[CacheGroupIDQueryParam])
if err != nil {
- return nil, errors.New("cache group id must be an integer"), nil, http.StatusBadRequest
+ return nil, errors.New("cache group id must be an integer"), nil, http.StatusBadRequest, nil
}
_, ok, err := dbhelpers.GetCacheGroupNameFromID(cgparam.ReqInfo.Tx.Tx, cgID)
if err != nil {
- return nil, nil, err, http.StatusInternalServerError
+ return nil, nil, err, http.StatusInternalServerError, nil
} else if !ok {
- return nil, errors.New("cachegroup does not exist"), nil, http.StatusNotFound
+ return nil, errors.New("cachegroup does not exist"), nil, http.StatusNotFound, nil
+ }
+
+ params := []interface{}{}
+ if useIMS {
+ runSecond, maxTime = ims.TryIfModifiedSinceQuery(cgparam.ReqInfo.Tx, h, queryValues, selectMaxLastUpdatedQuery(where))
+ if !runSecond {
+ log.Debugln("IMS HIT")
+ return params, nil, nil, http.StatusNotModified, &maxTime
+ }
+ log.Debugln("IMS MISS")
+ } else {
+ log.Debugln("Non IMS request")
}
query := selectQuery() + where + orderBy + pagination
rows, err := cgparam.ReqInfo.Tx.NamedQuery(query, queryValues)
if err != nil {
- return nil, nil, errors.New("querying " + cgparam.GetType() + ": " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("querying " + cgparam.GetType() + ": " + err.Error()), http.StatusInternalServerError, nil
}
defer rows.Close()
- params := []interface{}{}
for rows.Next() {
var p tc.CacheGroupParameterNullable
if err = rows.StructScan(&p); err != nil {
- return nil, nil, errors.New("scanning " + cgparam.GetType() + ": " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("scanning " + cgparam.GetType() + ": " + err.Error()), http.StatusInternalServerError, nil
}
if p.Secure != nil && *p.Secure && cgparam.ReqInfo.User.PrivLevel < auth.PrivLevelAdmin {
p.Value = ¶meter.HiddenField
@@ -102,7 +117,15 @@ func (cgparam *TOCacheGroupParameter) Read() ([]interface{}, error, error, int)
params = append(params, p)
}
- return params, nil, nil, http.StatusOK
+ return params, nil, nil, http.StatusOK, &maxTime
+}
+
+func selectMaxLastUpdatedQuery(where string) string {
+ return `SELECT max(t) from (
+ SELECT max(p.last_updated) as t FROM parameter p
+LEFT JOIN cachegroup_parameter cgp ON cgp.parameter = p.id ` + where +
+ ` UNION ALL
+ select max(last_updated) as t from last_deleted l where l.table_name='parameter') as res`
}
func selectQuery() string {
diff --git a/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters_test.go b/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters_test.go
index 04d098f..daf018e 100644
--- a/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters_test.go
+++ b/traffic_ops/traffic_ops_golang/cachegroupparameter/parameters_test.go
@@ -197,7 +197,7 @@ func TestReadCacheGroupParameters(t *testing.T) {
reqInfo := api.APIInfo{Tx: db.MustBegin(), Params: testCase.params}
toParameterReader.SetInfo(&reqInfo)
- parameters, userErr, sysErr, returnCode := toParameterReader.Read()
+ parameters, userErr, sysErr, returnCode, _ := toParameterReader.Read(nil, false)
if testCase.storageError != nil {
if sysErr == nil {
diff --git a/traffic_ops/traffic_ops_golang/cachegroupparameter/unassigned_parameters.go b/traffic_ops/traffic_ops_golang/cachegroupparameter/unassigned_parameters.go
index 3f1e0c0..b683831 100644
--- a/traffic_ops/traffic_ops_golang/cachegroupparameter/unassigned_parameters.go
+++ b/traffic_ops/traffic_ops_golang/cachegroupparameter/unassigned_parameters.go
@@ -22,8 +22,11 @@ package cachegroupparameter
import (
"errors"
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims"
"net/http"
"strconv"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-util"
@@ -51,24 +54,37 @@ func (cgunparam *TOCacheGroupUnassignedParameter) GetType() string {
return "cachegroup_unassigned_params"
}
-func (cgunparam *TOCacheGroupUnassignedParameter) Read() ([]interface{}, error, error, int) {
+func (cgunparam *TOCacheGroupUnassignedParameter) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
+ var maxTime time.Time
+ var runSecond bool
queryParamsToQueryCols := cgunparam.ParamColumns()
parameters := cgunparam.APIInfo().Params
where, orderBy, pagination, queryValues, errs := dbhelpers.BuildWhereAndOrderByAndPagination(parameters, queryParamsToQueryCols)
if len(errs) > 0 {
- return nil, util.JoinErrs(errs), nil, http.StatusBadRequest
+ return nil, util.JoinErrs(errs), nil, http.StatusBadRequest, nil
+ }
+
+ if useIMS {
+ runSecond, maxTime = ims.TryIfModifiedSinceQuery(cgunparam.APIInfo().Tx, h, queryValues, selectMaxLastUpdatedQuery(where))
+ if !runSecond {
+ log.Debugln("IMS HIT")
+ return []interface{}{}, nil, nil, http.StatusNotModified, &maxTime
+ }
+ log.Debugln("IMS MISS")
+ } else {
+ log.Debugln("Non IMS request")
}
cgID, err := strconv.Atoi(parameters[CacheGroupIDQueryParam])
if err != nil {
- return nil, errors.New("cache group id must be an integer"), nil, http.StatusBadRequest
+ return nil, errors.New("cache group id must be an integer"), nil, http.StatusBadRequest, nil
}
_, ok, err := dbhelpers.GetCacheGroupNameFromID(cgunparam.ReqInfo.Tx.Tx, cgID)
if err != nil {
- return nil, nil, err, http.StatusInternalServerError
+ return nil, nil, err, http.StatusInternalServerError, nil
} else if !ok {
- return nil, errors.New("cachegroup does not exist"), nil, http.StatusNotFound
+ return nil, errors.New("cachegroup does not exist"), nil, http.StatusNotFound, nil
}
// TODO: enhance build query to handle cols that are not in WHERE as well as appending to existing WHERE
@@ -80,7 +96,7 @@ func (cgunparam *TOCacheGroupUnassignedParameter) Read() ([]interface{}, error,
query := selectUnassignedParametersQuery() + where + orderBy + pagination
rows, err := cgunparam.ReqInfo.Tx.NamedQuery(query, queryValues)
if err != nil {
- return nil, nil, errors.New("querying " + cgunparam.GetType() + ": " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("querying " + cgunparam.GetType() + ": " + err.Error()), http.StatusInternalServerError, nil
}
defer rows.Close()
@@ -88,7 +104,7 @@ func (cgunparam *TOCacheGroupUnassignedParameter) Read() ([]interface{}, error,
for rows.Next() {
var p tc.CacheGroupParameterNullable
if err = rows.StructScan(&p); err != nil {
- return nil, nil, errors.New("scanning " + cgunparam.GetType() + ": " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("scanning " + cgunparam.GetType() + ": " + err.Error()), http.StatusInternalServerError, nil
}
if p.Secure != nil && *p.Secure && cgunparam.ReqInfo.User.PrivLevel < auth.PrivLevelAdmin {
p.Value = ¶meter.HiddenField
@@ -96,7 +112,7 @@ func (cgunparam *TOCacheGroupUnassignedParameter) Read() ([]interface{}, error,
params = append(params, p)
}
- return params, nil, nil, http.StatusOK
+ return params, nil, nil, http.StatusOK, &maxTime
}
func selectUnassignedParametersQuery() string {
diff --git a/traffic_ops/traffic_ops_golang/cdn/cdns.go b/traffic_ops/traffic_ops_golang/cdn/cdns.go
index 6729ab9..3e53a7c 100644
--- a/traffic_ops/traffic_ops_golang/cdn/cdns.go
+++ b/traffic_ops/traffic_ops_golang/cdn/cdns.go
@@ -20,8 +20,10 @@ package cdn
*/
import (
+ "net/http"
"strconv"
"strings"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-tc/tovalidate"
@@ -39,6 +41,13 @@ type TOCDN struct {
tc.CDNNullable
}
+func (v *TOCDN) SelectMaxLastUpdatedQuery(where, orderBy, pagination, tableName string) string {
+ return `SELECT max(t) from (
+ SELECT max(last_updated) as t from ` + tableName + ` c ` + where + orderBy + pagination +
+ ` UNION ALL
+ select max(last_updated) as t from last_deleted l where l.table_name='` + tableName + `') as res`
+}
+
func (v *TOCDN) SetLastUpdated(t tc.TimeNoMod) { v.LastUpdated = &t }
func (v *TOCDN) InsertQuery() string { return insertQuery() }
func (v *TOCDN) NewReadObj() interface{} { return &tc.CDNNullable{} }
@@ -123,7 +132,9 @@ func (cdn *TOCDN) Create() (error, error, int) {
return api.GenericCreate(cdn)
}
-func (cdn *TOCDN) Read() ([]interface{}, error, error, int) { return api.GenericRead(cdn) }
+func (cdn *TOCDN) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
+ return api.GenericRead(h, cdn, useIMS)
+}
func (cdn *TOCDN) Update() (error, error, int) {
*cdn.DomainName = strings.ToLower(*cdn.DomainName)
diff --git a/traffic_ops/traffic_ops_golang/cdn/cdns_test.go b/traffic_ops/traffic_ops_golang/cdn/cdns_test.go
index 3d1daa1..398de95 100644
--- a/traffic_ops/traffic_ops_golang/cdn/cdns_test.go
+++ b/traffic_ops/traffic_ops_golang/cdn/cdns_test.go
@@ -86,7 +86,7 @@ func TestReadCDNs(t *testing.T) {
api.APIInfoImpl{&reqInfo},
tc.CDNNullable{},
}
- cdns, userErr, sysErr, _ := obj.Read()
+ cdns, userErr, sysErr, _, _ := obj.Read(nil, false)
if userErr != nil || sysErr != nil {
t.Errorf("Read expected: no errors, actual: %v %v", userErr, sysErr)
}
diff --git a/traffic_ops/traffic_ops_golang/cdn/configs.go b/traffic_ops/traffic_ops_golang/cdn/configs.go
index 6dd2c50..691c2cb 100644
--- a/traffic_ops/traffic_ops_golang/cdn/configs.go
+++ b/traffic_ops/traffic_ops_golang/cdn/configs.go
@@ -23,6 +23,8 @@ import (
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers"
+ "net/http"
+ "time"
)
// TOCDNConf used as a type alias to define functions on to satisfy shared API REST interfaces.
@@ -43,10 +45,15 @@ id
FROM cdn`
}
-func (v *TOCDNConf) Read() ([]interface{}, error, error, int) {
- return api.GenericRead(v)
+func (v *TOCDNConf) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
+ return api.GenericRead(h, v, useIMS)
+}
+func (v *TOCDNConf) SelectMaxLastUpdatedQuery(where, orderBy, pagination, tableName string) string {
+ return `SELECT max(t) from (
+ SELECT max(last_updated) as t from federation ` + where + orderBy + pagination +
+ ` UNION ALL
+ select max(last_updated) as t from last_deleted l where l.table_name='federation') as res`
}
-
func (v TOCDNConf) GetType() string {
return "cdn_configs"
}
diff --git a/traffic_ops/traffic_ops_golang/cdn/domains.go b/traffic_ops/traffic_ops_golang/cdn/domains.go
index e6c3bcd..b0d4fef 100644
--- a/traffic_ops/traffic_ops_golang/cdn/domains.go
+++ b/traffic_ops/traffic_ops_golang/cdn/domains.go
@@ -21,7 +21,10 @@ package cdn
import (
"fmt"
+ "github.com/apache/trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/util/ims"
"net/http"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api"
@@ -31,16 +34,36 @@ import (
const RouterProfilePrefix = "CCR"
-func getDomainsList(tx *sqlx.Tx) ([]tc.Domain, error) {
+func selectMaxLastUpdatedQuery() string {
+ return `SELECT max(t) from (
+ SELECT max(profile.last_updated) as t FROM profile
+JOIN cdn ON profile.cdn = cdn.id WHERE profile.name LIKE '` + RouterProfilePrefix + `%'
+UNION ALL
+ select max(last_updated) as t from last_deleted l where l.table_name='profile') as res`
+}
+func getDomainsList(useIMS bool, header http.Header, tx *sqlx.Tx) ([]tc.Domain, error, int, *time.Time) {
+ var maxTime time.Time
+ var runSecond bool
domains := []tc.Domain{}
q := `SELECT p.id, p.name, p.description, domain_name FROM profile AS p
JOIN cdn ON p.cdn = cdn.id WHERE p.name LIKE '` + RouterProfilePrefix + `%'`
+ if useIMS {
+ runSecond, maxTime = ims.TryIfModifiedSinceQuery(tx, header, nil, selectMaxLastUpdatedQuery())
+ if !runSecond {
+ log.Debugln("IMS HIT")
+ return domains, nil, http.StatusNotModified, &maxTime
+ }
+ log.Debugln("IMS MISS")
+ } else {
+ log.Debugln("Non IMS request")
+ }
+
rows, err := tx.Query(q)
if err != nil {
- return nil, fmt.Errorf("querying for profile: %s", err)
+ return nil, fmt.Errorf("querying for profile: %s", err), http.StatusInternalServerError, nil
}
defer rows.Close()
@@ -49,16 +72,16 @@ func getDomainsList(tx *sqlx.Tx) ([]tc.Domain, error) {
d := tc.Domain{ParameterID: -1}
err := rows.Scan(&d.ProfileID, &d.ProfileName, &d.ProfileDescription, &d.DomainName)
if err != nil {
- return nil, fmt.Errorf("getting profile: %s", err)
+ return nil, fmt.Errorf("getting profile: %s", err), http.StatusInternalServerError, nil
}
domains = append(domains, d)
}
- return domains, nil
+ return domains, nil, http.StatusOK, &maxTime
}
func DomainsHandler(w http.ResponseWriter, r *http.Request) {
-
+ useIMS := false
inf, userErr, sysErr, errCode := api.NewInfo(r, nil, nil)
if userErr != nil || sysErr != nil {
api.HandleErr(w, r, inf.Tx.Tx, errCode, userErr, sysErr)
@@ -66,11 +89,19 @@ func DomainsHandler(w http.ResponseWriter, r *http.Request) {
}
defer inf.Close()
- domains, err := getDomainsList(inf.Tx)
+ cfg, err := api.GetConfig(r.Context())
+ if err != nil {
+ log.Warnf("Couldnt get the config %v", err)
+ }
+ if cfg != nil {
+ useIMS = cfg.UseIMS
+ }
+
+ domains, err, status, _ := getDomainsList(useIMS, r.Header, inf.Tx)
if err != nil {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusInternalServerError, err, err)
return
}
-
+ w.WriteHeader(status)
api.WriteResp(w, r, domains)
}
diff --git a/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations.go b/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations.go
index ea32f8c..4347e83 100644
--- a/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations.go
+++ b/traffic_ops/traffic_ops_golang/cdnfederation/cdnfederations.go
@@ -25,6 +25,7 @@ import (
"net/http"
"strconv"
"strings"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-tc/tovalidate"
@@ -45,7 +46,14 @@ type TOCDNFederation struct {
func (v *TOCDNFederation) SetLastUpdated(t tc.TimeNoMod) { v.LastUpdated = &t }
func (v *TOCDNFederation) InsertQuery() string { return insertQuery() }
-func (v *TOCDNFederation) NewReadObj() interface{} { return &TOCDNFederation{} }
+func (v *TOCDNFederation) SelectMaxLastUpdatedQuery(where, orderBy, pagination, tableName string) string {
+ return `SELECT max(t) from (
+ SELECT max(last_updated) as t from federation ` + where + orderBy + pagination +
+ ` UNION ALL
+ select max(last_updated) as t from last_deleted l where l.table_name='federation') as res`
+}
+
+func (v *TOCDNFederation) NewReadObj() interface{} { return &TOCDNFederation{} }
func (v *TOCDNFederation) SelectQuery() string {
if v.ID != nil {
return selectByID()
@@ -143,45 +151,45 @@ func checkTenancy(tenantID *int, tenantIDs []int) bool {
return false
}
-func (fed *TOCDNFederation) Read() ([]interface{}, error, error, int) {
+func (fed *TOCDNFederation) Read(h http.Header, useIMS bool) ([]interface{}, error, error, int, *time.Time) {
if idstr, ok := fed.APIInfo().Params["id"]; ok {
id, err := strconv.Atoi(idstr)
if err != nil {
- return nil, errors.New("id must be an integer"), nil, http.StatusBadRequest
+ return nil, errors.New("id must be an integer"), nil, http.StatusBadRequest, nil
}
fed.ID = util.IntPtr(id)
}
tenantIDs, err := tenant.GetUserTenantIDListTx(fed.APIInfo().Tx.Tx, fed.APIInfo().User.TenantID)
if err != nil {
- return nil, nil, errors.New("getting tenant list for user: " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("getting tenant list for user: " + err.Error()), http.StatusInternalServerError, nil
}
- federations, userErr, sysErr, errCode := api.GenericRead(fed)
+ federations, userErr, sysErr, errCode, maxTime := api.GenericRead(h, fed, useIMS)
if userErr != nil || sysErr != nil {
- return nil, userErr, sysErr, errCode
+ return nil, userErr, sysErr, errCode, nil
}
filteredFederations := []interface{}{}
for _, ifederation := range federations {
federation := ifederation.(*TOCDNFederation)
if !checkTenancy(federation.TenantID, tenantIDs) {
- return nil, errors.New("user not authorized for requested federation"), nil, http.StatusForbidden
+ return nil, errors.New("user not authorized for requested federation"), nil, http.StatusForbidden, nil
}
filteredFederations = append(filteredFederations, federation.CDNFederation)
}
if len(filteredFederations) == 0 {
if fed.ID != nil {
- return nil, errors.New("not found"), nil, http.StatusNotFound
+ return nil, errors.New("not found"), nil, http.StatusNotFound, nil
}
if ok, err := dbhelpers.CDNExists(fed.APIInfo().Params["name"], fed.APIInfo().Tx.Tx); err != nil {
- return nil, nil, errors.New("verifying CDN exists: " + err.Error()), http.StatusInternalServerError
+ return nil, nil, errors.New("verifying CDN exists: " + err.Error()), http.StatusInternalServerError, nil
} else if !ok {
- return nil, errors.New("cdn not found"), nil, http.StatusNotFound
+ return nil, errors.New("cdn not found"), nil, http.StatusNotFound, nil
}
}
- return filteredFederations, nil, nil, http.StatusOK
+ return filteredFederations, nil, nil, errCode, maxTime
}
func (fed *TOCDNFederation) Update() (error, error, int) {
diff --git a/traffic_ops/traffic_ops_golang/config/config.go b/traffic_ops/traffic_ops_golang/config/config.go
index 1e798c9..138dcb9 100644
--- a/traffic_ops/traffic_ops_golang/config/config.go
+++ b/traffic_ops/traffic_ops_golang/config/config.go
@@ -59,6 +59,7 @@ type Config struct {
InfluxEnabled bool
InfluxDBConfPath string `json:"influxdb_conf_path"`
Version string
+ UseIMS bool `json:"use_ims"`
}
// ConfigHypnotoad carries http setting for hypnotoad (mojolicious) server
@@ -99,7 +100,6 @@ type ConfigTrafficOpsGolang struct {
WhitelistedOAuthUrls []string `json:"whitelisted_oauth_urls"`
OAuthClientSecret string `json:"oauth_client_secret"`
RoutingBlacklist `json:"routing_blacklist"`
-
// CRConfigUseRequestHost is whether to use the client request host header in the CRConfig. If false, uses the tm.url parameter.
// This defaults to false. Traffic Ops used to always use the host header, setting this true will resume that legacy behavior.
// See https://github.com/apache/trafficcontrol/issues/2224
diff --git a/traffic_ops/traffic_ops_golang/coordinate/coordinates.go b/traffic_ops/traffic_ops_golang/coordinate/coordinates.go
index 8104ebf..8515e68 100644
--- a/traffic_ops/traffic_ops_golang/coordinate/coordinates.go
+++ b/traffic_ops/traffic_ops_golang/coordinate/coordinates.go
@@ -20,8 +20,10 @@ package coordinate
*/
import (
+ "net/http"
"strconv"
"strings"
+ "time"
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-tc/tovalidate"
@@ -117,10 +119,19 @@ func (coordinate TOCoordinate) Validate() error {
return util.JoinErrs(tovalidate.ToErrors(errs))
... 3058 lines suppressed ...